Merge branch 'master' into stable

2015-06-10 00:00:12 +02:00 · 2015-06-10 00:00:12 +02:00 · 7dfced21a2
parent c25be031fc 7b0a65e295
commit 7dfced21a2
8348 changed files with 639621 additions and 538998 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,41 +1,32 @@
-
+# Ignore image thumbnail files created by windows
 #ignore thumbnails created by windows
 Thumbs.db
-#Ignore files built by Visual Studio
+# Ignore Finder view option files created by OS X
-*.obj
+.DS_Store
-*.exe
+# Ignore autogenerated source files
-*.pdb
+Source/Core/Common/scmrev.h
-*.user
+# Ignore files output by build
-*.aps
+/[Bb]uild*/
-*.pch
+/[Bb]inary/
-*.vspscc
+/obj/
-*_i.c
+# Android cmake builds to here then copies to Source/Android.
-*_p.c
+/libs/
-*.ncb
+# Ignore various files created by visual studio/msbuild
-*.suo
+*.ipch
 *.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
 *.opensdf
 *.sdf
-[Bb]uild
+*.suo
-*.ipch
+*.vcxproj.user
-.sconsign.dblite
+*.obj
-Externals/scons-local/*
+*.tlog
-.DS_Store
+# 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/
--- a/.gitmodules
+++ b/.gitmodules
@ -0,0 +1,4 @@
 [submodule "Externals/Qt"]
 	path = Externals/Qt
 	url = https://github.com/dolphin-emu/ext-win-qt.git
 	branch = master
--- a/.hgeol
+++ b/.hgeol
@ -1,3 +0,0 @@
 [patterns]
 Data/User/Wii/**.* = BIN
 ** = native
--- a/.hgignore
+++ b/.hgignore
@ -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
--- a/.mailmap
+++ 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>
--- 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(TRY_X11 "Enables X11 Support" ON)
-option(USE_WAYLAND "Enables Wayland Support" OFF)
+option(USE_SHARED_ENET "Use shared libenet if found rather than Dolphin's soon-to-compatibly-diverge version" OFF)
 option(USE_GLES "Enables GLES2 And EGL, disables OGL" OFF)
 option(USE_GLES3 "Enables GLES3 and EGL" 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(GDBSTUB "Enable gdb stub for remote debugging." OFF)
-option(ENCODE_FRAMEDUMPS "Encode framedumps in AVI format" ON)
+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")
+	if (NOT DEFINED CMAKE_CXX_COMPILER)
-	set(CMAKE_CXX_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}")
+		if (NOT EXISTS "${CMAKE_CXX_COMPILER}")
-		set(CMAKE_C_COMPILER "clang")
+			set(CMAKE_CXX_COMPILER "clang++")
-		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)
+# Detect 64bit or 32bit
-	set(_M_ARM 1)
+# CMake doesn't provide a simple way to determine 32bit or 64bit
-	add_definitions(-marm -march=armv7-a)
+# If we ever support a architecture that is 64bit with 32bit pointers then this'll break
-	add_definitions(-D_M_ARM=1)
+# Of course the chances of that are slim(x32?) so who cares
-	add_definitions(-D_M_GENERIC=1)
+if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-	# Set generic options so you don't have to pass anything to cmake to build ARM
+	set(_ARCH_64 1)
-	set(USE_GLES 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")
+if(NOT ENABLE_GENERIC)
-	set(_M_GENERIC 1)
+	if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^x86" OR
-	set(_M_MIPS 1)
+	   ${CMAKE_SYSTEM_PROCESSOR} MATCHES "i.86" OR
-	add_definitions(-D_M_MIPS=1)
+	   APPLE)
-	add_definitions(-D_M_GENERIC=1)
+		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
+if(ENABLE_GENERIC)
-#set(_M_GENERIC 1)
+	message("Warning! Building generic build!")
-#add_definitions(-D_M_GENERIC=1)
+	set(_M_GENERIC 1)
-# Various compile flags
+	add_definitions(-D_M_GENERIC=1)
 if(NOT _M_GENERIC)
 	add_definitions(-msse2)
 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)
+if(ENABLE_PIE)
-	# Ignore MacPorts and Fink and any other locally installed packages that
+	add_definitions(-fPIE)
-	# might prevent building a distributable binary.
+	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pie")
-	set(CMAKE_SYSTEM_PREFIX_PATH /usr)
+endif()
 	set(ENV{PATH} /usr/bin:/bin:/usr/sbin:/sbin)
-	# Some of our code contains Objective C constructs.
+if(ENABLE_LTO)
-	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -x objective-c -stdlib=libc++")
+	check_and_add_flag(LTO -flto)
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -x objective-c++ -stdlib=libc++")
+	if(CMAKE_CXX_COMPILER_ID STREQUAL GNU)
-	# Avoid mistaking an object file for a source file on the link command line.
+		set(CMAKE_AR gcc-ar)
-	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -x none")
+		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_LEGACY_PATH "/Developer/SDKs/MacOSX10.9.sdk")
-	set(SYSROOT_PATH "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.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)
+include_directories(Externals/GL)
-	message("EGL OpenGL interface enabled")
+
 	add_definitions(-DUSE_EGL=1)
 else()
 	# Using GLX
 	set(USE_X11 1)
 	set(USE_WAYLAND 0)
 endif()
 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)
+	include(FindLLVM OPTIONAL)
-		# Note: The convention is to check USE_X11 or USE_WAYLAND where needed.
+	if (LLVM_FOUND)
-		# This is where we detect platforms and set the variables accordingly.
+		add_definitions(-DHAS_LLVM=1)
-		pkg_check_modules(WAYLAND wayland-egl wayland-client wayland-cursor)
+		set(HAS_LLVM 1)
 		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)
-		# Note: We do not need to explicitly check for X11 as it is done in the cmake
+		include_directories(${LLVM_INCLUDE_DIRS})
-		# FindOpenGL module on linux.
+		list(APPEND LIBS ${LLVM_LIBRARIES})
-		if(USE_X11 AND X11_FOUND)
+
 		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(OPROFILE "(no .pc for opagent)" opagent opagent.h)
-		check_lib(BFD bfd bfd.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)
 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)
 ########################################
 # 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)
+if(NOT ANDROID AND USE_SHARED_ENET)
-	check_lib(LZO lzo2 lzo/lzo1x.h QUIET)
+	check_lib(ENET libenet enet enet/enet.h QUIET)
-endif()
+	include(CheckSymbolExists)
-if(LZO_FOUND)
+	if (ENET_FOUND)
-	message("Using shared lzo")
+		set(CMAKE_REQUIRED_INCLUDES ${ENET_INCLUDE_DIRS})
-else()
+		# hack: LDFLAGS already contains -lenet but all flags but the first are
-	message("Using static lzo from Externals")
+		# dropped; ugh, cmake
-	add_subdirectory(Externals/LZO)
+		set(CMAKE_REQUIRED_FLAGS ${ENET_LDFLAGS})
-	include_directories(Externals/LZO)
+		set(CMAKE_REQUIRED_LIBRARIES ${ENET_LIBRARIES})
-	set(LZO lzo2)
+		CHECK_SYMBOL_EXISTS(enet_socket_get_address enet/enet.h ENET_HAVE_SGA)
-endif()
+		set(CMAKE_REQUIRED_INCLUDES)
-
+		set(CMAKE_REQUIRED_FLAGS)
-if(ANDROID)
+		set(CMAKE_REQUIRED_LIBRARIES)
-	message("Using static libpng from Externals")
+		if (NOT ENET_HAVE_SGA)
-	add_subdirectory(Externals/libpng)
+			# enet is too old
-	include_directories(Externals/libpng)
+			set(ENET_FOUND FALSE)
 	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)
 		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 (ENET_FOUND)
-if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT ANDROID)
+	message("Using shared enet")
 	include(FindPolarSSL)
 endif()
 if(POLARSSL_FOUND AND POLARSSL_WORKS)
 	message("Using shared PolarSSL")
 	include_directories(${POLARSSL_INCLUDE_DIR})
 else()
-	message("Using PolarSSL from Externals")
+	message("Using static enet from Externals")
-	set(POLARSSL_LIBRARY polarssl)
+	include_directories(Externals/enet/include)
-	add_subdirectory(Externals/polarssl/)
+	add_subdirectory(Externals/enet)
 	include_directories(Externals/polarssl/include)
 endif()
 LIST(APPEND LIBS enet)
-if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT ANDROID)
+if(NOT XXHASH_FOUND)
-	check_lib(SOIL SOIL SOIL/SOIL.h QUIET)
+	message("Using static xxhash from Externals")
-endif()
+	add_subdirectory(Externals/xxhash)
-if(SOIL_FOUND)
+	include_directories(Externals/xxhash)
 	message("Using shared SOIL")
 else()
 	message("Using static SOIL from Externals")
 	add_subdirectory(Externals/SOIL)
 	include_directories(Externals/SOIL)
 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)
+if(NOT APPLE AND NOT ANDROID)
-	find_library(GLEW glew32s PATHS Externals/GLew)
+	check_lib(LZO "(no .pc for lzo2)" lzo2 lzo/lzo1x.h QUIET)
-	include_directories(Externals/GLew/include)
+endif()
 if(LZO_FOUND)
 	message("Using shared lzo")
 else()
-	if(NOT USE_GLES3)
+	message("Using static lzo from Externals")
-		if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+	add_subdirectory(Externals/LZO)
-			include(FindGLEW)
+	include_directories(Externals/LZO)
-		endif()
+	set(LZO lzo2)
-		if(NOT GLEW_FOUND OR NOT GLEW_HAS_1_9_METHODS)
+endif()
-			message("Using static GLEW from Externals")
+list(APPEND LIBS ${LZO})
-			add_subdirectory(Externals/GLew)
+
-			include_directories(Externals/GLew/include)
+if(NOT APPLE AND NOT ANDROID)
-		endif()
+	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)
+if(ENABLE_QT)
-	find_library(CL OpenCL)
+	find_package(Qt5Widgets REQUIRED)
-	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-weak_framework,OpenCL")
+	message("Found Qt version ${Qt5Core_VERSION}, enabling the Qt backend")
 else()
 	include_directories(Externals/CLRun/include)
 	add_subdirectory(Externals/CLRun)
 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 "3.0.1")
 			set(wxMIN_VERSION "2.9.3")
 		else()
 			set(wxMIN_VERSION "2.9.4")
 		endif()
 		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(GTHREAD2 gthread-2.0 gthread-2.0 glib/gthread.h REQUIRED)
-			check_lib(PANGOCAIRO pangocairo pango/pangocairo.h REQUIRED)
+			check_lib(PANGOCAIRO pangocairo pangocairo pango/pangocairo.h REQUIRED)
-		elseif(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+		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")
+if(DOLPHIN_WC_BRANCH STREQUAL "master" OR DOLPHIN_WC_BRANCH STREQUAL "stable")
-	set(DOLPHIN_WC_IS_MASTER "1")
+	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
+	install(FILES Installer/dolphin-emu.xpm
-		DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps RENAME dolphin-emu.xpm)
+		DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps)
-	install(FILES Source/Core/DolphinWX/resources/dolphin-emu.desktop
+	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)
--- 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 ${pc})
 		pkg_search_module(${var} QUIET ${lower_lib})
 	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
+		pkg_check_modules(LIBAV libavcodec>=54.35.0 libavformat>=54.20.4
-			libswscale>=2.1.0 libavutil>=51.22.1)
+			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()
--- a/CMakeTests/FindGLEW.cmake
+++ b/CMakeTests/FindGLEW.cmake
@ -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()
--- a/CMakeTests/FindLLVM.cmake
+++ 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()
--- 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;
--- 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)
+# validate cached values (but use them as hints)
-	# Already in cache, be silent
+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_context ctx;
-	ssl_session session;
+		ssl_session session;
-	havege_state hs;
+		entropy_context entropy;
 		ctr_drbg_context ctr_drbg;
 		x509_crt cacert;
 		x509_crt clicert;
 		pk_context pk;
-	ssl_init(&ctx);
+		ssl_init(&ctx);
-	havege_init(&hs);
+		entropy_init(&entropy);
 	ssl_set_rng(&ctx, havege_random, &hs);
 	ssl_set_session(&ctx, &session);
-	ssl_close_notify(&ctx);
+		const char* pers = \"dolphin-emu\";
-	ssl_session_free(&session);
+		ctr_drbg_init(&ctr_drbg, entropy_func,
-	ssl_free(&ctx);
+		                    &entropy,
 		                    (const unsigned char*)pers,
 		                    strlen(pers));
-	return 0;
+		ssl_set_rng(&ctx, ctr_drbg_random, &ctr_drbg);
 		ssl_set_session(&ctx, &session);
 		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)
--- 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:
+# Usage
-# - 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)
+# When you try to locate the SFML libraries, you must specify which modules you want to use (system, window, graphics, network, audio, main).
-#   - SFML_XXX_LIBRARY, the name of the library to link to for the xxx module (includes both debug and optimized names if necessary)
+# If none is given, the SFML_LIBRARIES variable will be empty and you'll end up linking to nothing.
-#   - SFML_XXX_FOUND, true if either the debug or release library of the xxx module is found
+# example:
-# - SFML_LIBRARIES, the list of all libraries corresponding to the required modules
+#   find_package(SFML COMPONENTS graphics window system) // find the graphics, window and system 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)
+# 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/
+          /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)
 # 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
+set(SFML_FOUND TRUE) # will be set to false if one of the required modules is not found
-                        /Library/Frameworks
+set(FIND_SFML_LIB_PATHS
-                        /usr/local
+    ${SFML_ROOT}
-                        /usr
+    $ENV{SFML_ROOT}
-                        /sw
+    ~/Library/Frameworks
-                        /opt/local
+    /Library/Frameworks
-                        /opt/csw
+    /usr/local
-                        /opt
+    /usr
-                        ${SFMLDIR}
+    /sw
-                        $ENV{SFMLDIR})
+    /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)
@ -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()
--- a/Contributing.md
+++ 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.
--- a/Data/Sys/GC/font-licenses.txt
+++ 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.
--- a/Data/Sys/GC/font_ansi.bin
+++ b/Data/Sys/GC/font_ansi.bin
--- a/Data/Sys/GC/font_sjis.bin
+++ b/Data/Sys/GC/font_sjis.bin
--- a/Data/Sys/GameSettings/010.ini
+++ 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
--- a/Data/Sys/GameSettings/301.ini
+++ 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]
--- a/Data/Sys/GameSettings/C94.ini
+++ 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
--- a/Data/Sys/GameSettings/C96.ini
+++ 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
--- a/Data/Sys/GameSettings/C97.ini
+++ 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
--- a/Data/Sys/GameSettings/C9M.ini
+++ 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
--- a/Data/Sys/GameSettings/C9X.ini
+++ 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
--- a/Data/Sys/GameSettings/D43.ini
+++ 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
--- a/Data/Sys/GameSettings/D43E01.ini
+++ b/Data/Sys/GameSettings/D43E01.ini
@ -1,12 +1,4 @@
-# D43E01 - ZELDA OCARINA MULTI PACK
+# D43E01 - Legend of Zelda, The - Ocarina of Time - Master 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 = Minor video glitches when pausing
 [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.
-
+$Max Hearts
-[Video]
+02BE1816 00000140
-ProjectionHack = 0
+$Infinite Hearts
-PH_SZNear = 0
+02BE1818 00000140
-PH_SZFar = 0
+$Infinite Magic
-PH_ExtraParam = 0
+08BE1821 00000008
-PH_ZNear =
+00BE1890 00000007
-PH_ZFar =
+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
--- 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.
--- a/Data/Sys/GameSettings/D43P01.ini
+++ b/Data/Sys/GameSettings/D43P01.ini
@ -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
--- a/Data/Sys/GameSettings/D43U01.ini
+++ b/Data/Sys/GameSettings/D43U01.ini
@ -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
--- a/Data/Sys/GameSettings/D85.ini
+++ 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]
--- a/Data/Sys/GameSettings/DD2.ini
+++ 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
--- a/Data/Sys/GameSettings/DLS.ini
+++ 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
--- a/Data/Sys/GameSettings/DTL.ini
+++ 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.
--- a/Data/Sys/GameSettings/DTLX01.ini
+++ b/Data/Sys/GameSettings/DTLX01.ini
@ -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.
--- a/Data/Sys/GameSettings/DVDXDV.ini
+++ b/Data/Sys/GameSettings/DVDXDV.ini
@ -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.
--- a/Data/Sys/GameSettings/FA6.ini
+++ 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
--- a/Data/Sys/GameSettings/FA7.ini
+++ 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
--- a/Data/Sys/GameSettings/FA8.ini
+++ 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
--- a/Data/Sys/GameSettings/FA9.ini
+++ 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
--- a/Data/Sys/GameSettings/FAA.ini
+++ 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
--- a/Data/Sys/GameSettings/FAB.ini
+++ 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
--- a/Data/Sys/GameSettings/FABP01.ini
+++ b/Data/Sys/GameSettings/FABP01.ini
@ -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
--- a/Data/Sys/GameSettings/FAG.ini
+++ 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
--- a/Data/Sys/GameSettings/FAH.ini
+++ 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
--- a/Data/Sys/GameSettings/FAK.ini
+++ 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
--- a/Data/Sys/GameSettings/FAL.ini
+++ 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
--- a/Data/Sys/GameSettings/FAN.ini
+++ 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
--- a/Data/Sys/GameSettings/FAO.ini
+++ 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
--- a/Data/Sys/GameSettings/FAP.ini
+++ 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
--- a/Data/Sys/GameSettings/FAQ.ini
+++ 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
--- a/Data/Sys/GameSettings/FAS.ini
+++ 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
--- a/Data/Sys/GameSettings/FAT.ini
+++ 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
--- a/Data/Sys/GameSettings/FAV.ini
+++ 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
--- a/Data/Sys/GameSettings/FAW.ini
+++ 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
--- a/Data/Sys/GameSettings/FAX.ini
+++ 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
--- a/Data/Sys/GameSettings/FB4.ini
+++ 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
--- a/Data/Sys/GameSettings/FB5.ini
+++ 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
--- a/Data/Sys/GameSettings/FBB.ini
+++ 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
--- a/Data/Sys/GameSettings/FBC.ini
+++ 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
--- a/Data/Sys/GameSettings/FBD.ini
+++ 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
--- a/Data/Sys/GameSettings/FBE.ini
+++ 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
--- a/Data/Sys/GameSettings/FBH.ini
+++ 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
--- a/Data/Sys/GameSettings/FBI.ini
+++ 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
--- a/Data/Sys/GameSettings/FBJ.ini
+++ 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
--- a/Data/Sys/GameSettings/FBL.ini
+++ 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
--- a/Data/Sys/GameSettings/FBN.ini
+++ 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
--- a/Data/Sys/GameSettings/FBR.ini
+++ 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
--- a/Data/Sys/GameSettings/FBS.ini
+++ 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
--- a/Data/Sys/GameSettings/FBU.ini
+++ 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
--- a/Data/Sys/GameSettings/FBY.ini
+++ 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
--- a/Data/Sys/GameSettings/FBYE01.ini
+++ b/Data/Sys/GameSettings/FBYE01.ini
@ -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.
--- a/Data/Sys/GameSettings/FBZ.ini
+++ 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
--- a/Data/Sys/GameSettings/FC3.ini
+++ 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
--- a/Data/Sys/GameSettings/FC6.ini
+++ 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
--- a/Data/Sys/GameSettings/FC7.ini
+++ 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
--- a/Data/Sys/GameSettings/FC8.ini
+++ 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
--- a/Data/Sys/GameSettings/FCA.ini
+++ 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
--- a/Data/Sys/GameSettings/FCP.ini
+++ 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
--- a/Data/Sys/GameSettings/FCQ.ini
+++ 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
--- a/Data/Sys/GameSettings/FCR.ini
+++ 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
--- a/Data/Sys/GameSettings/FCS.ini
+++ 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
--- a/Data/Sys/GameSettings/FCT.ini
+++ 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
--- a/Data/Sys/GameSettings/FCU.ini
+++ 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
--- a/Data/Sys/GameSettings/FCV.ini
+++ 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
--- a/Data/Sys/GameSettings/FCW.ini
+++ 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
--- a/Data/Sys/GameSettings/FCY.ini
+++ 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
--- a/Data/Sys/GameSettings/FCZ.ini
+++ 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
--- a/Data/Sys/GameSettings/FD2.ini
+++ 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
--- a/Data/Sys/GameSettings/FD6.ini
+++ 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
--- a/Data/Sys/GameSettings/FD7.ini
+++ 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
--- a/Data/Sys/GameSettings/FDA.ini
+++ 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
--- a/Data/Sys/GameSettings/FDF.ini
+++ 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
--- a/Data/Sys/GameSettings/FDG.ini
+++ 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
--- a/Data/Sys/GameSettings/FDL.ini
+++ 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
--- a/Data/Sys/GameSettings/FDN.ini
+++ 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
--- a/Data/Sys/GameSettings/FDO.ini
+++ 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
--- a/Data/Sys/GameSettings/FDP.ini
+++ 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
--- a/Data/Sys/GameSettings/FDQ.ini
+++ 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
--- a/Data/Sys/GameSettings/FDT.ini
+++ 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
--- a/Data/Sys/GameSettings/FDU.ini
+++ 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
--- a/Data/Sys/GameSettings/FDV.ini
+++ 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
--- a/Show More
+++ b/Show More