Rebase immediate-removal on master

.gitignore

@@ -27,9 +27,7 @@ obj/
 [Rr]elease*/
 _ReSharper*/
 [Tt]est[Rr]esult*
-Binary/Win32
+Binary
-Binary/x64
-Binary/Darwin*
 Source/Core/Common/Src/scmrev.h
 *.opensdf
 *.sdf

CMakeLists.txt

@@ -2,16 +2,29 @@
 # General setup
 #
 cmake_minimum_required(VERSION 2.6)
+
+# Update compiler before calling project()
+if (APPLE)
+	# Use clang compiler
+	set(CMAKE_C_COMPILER "clang")
+	set(CMAKE_CXX_COMPILER "clang++")
+endif()
 project(dolphin-emu)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/CMakeTests)
 set(DOLPHIN_IS_STABLE FALSE)
 
 # Set up paths
+if((${CMAKE_SYSTEM_NAME} MATCHES "Darwin"))
+	# 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)
+else()
 	set(bindir  ${CMAKE_INSTALL_PREFIX}/bin               CACHE PATH "bindir")
 	set(datadir ${CMAKE_INSTALL_PREFIX}/share/dolphin-emu CACHE PATH "datadir")
+	add_definitions(-DDATA_DIR="${datadir}/")
+endif()
 set(userdir ".dolphin-emu" CACHE STRING "User directory")
 add_definitions(-DUSER_DIR="${userdir}")
-add_definitions(-DDATA_DIR="${datadir}/")
 
 # Set where the binary files will be built.  The program will not execute from
 # here.  You must run "make install" to install these to the proper location
@@ -67,6 +80,15 @@ if(GIT_FOUND AND NOT DOLPHIN_WC_REVISION)
 	OUTPUT_STRIP_TRAILING_WHITESPACE)
 endif()
 
+# version number
+set(DOLPHIN_VERSION_MAJOR "3")
+set(DOLPHIN_VERSION_MINOR "0")
+if(DOLPHIN_IS_STABLE)
+	set(DOLPHIN_VERSION_PATCH "0")
+else()
+	set(DOLPHIN_VERSION_PATCH ${DOLPHIN_WC_REVISION})
+endif()
+
 # Various compile flags
 add_definitions(-msse2)
 
@@ -100,23 +122,67 @@ if(UNIX AND NOT APPLE)
 endif()
 
 if(APPLE)
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -x objective-c++")
+
+	# Some of our code contains Objective C constructs.
 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -x objective-c")
-	FIND_LIBRARY(ATB_LIBRARY AudioToolbox)
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -x objective-c++")
-	FIND_LIBRARY(AU_LIBRARY AudioUnit)		
+	# Avoid mistaking an object file for a source file on the link command line.
-	FIND_LIBRARY(CARBON_LIBRARY Carbon)
+	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -x none")
-	FIND_LIBRARY(COCOA_LIBRARY Cocoa)
+
-	FIND_LIBRARY(COREAUDIO_LIBRARY CoreAudio)
+	# Identify the target system:
-	FIND_LIBRARY(COREFUND_LIBRARY CoreFoundation)
+	# Ask for 32/64-bit fat binary.
-	FIND_LIBRARY(CORESERV_LIBRARY CoreServices)
+	set(TARGET_FLAGS "-arch x86_64 -arch i386")
-	FIND_LIBRARY(IOB_LIBRARY IOBluetooth)
+	# Minimum OS X version.
-	FIND_LIBRARY(IOK_LIBRARY IOKit)		
+	# This is inserted into the Info.plist as well.
-	FIND_LIBRARY(OGL_LIBRARY OpenGL)
+	# Note that the SDK determines the maximum version of which optional
-	FIND_LIBRARY(WEBKIT_LIBRARY WebKit)		
+	# features can be used, not the minimum required version to run.
-	SET(EXTRA_LIBS ${ATB_LIBRARY} ${AU_LIBRARY} ${CARBON_LIBRARY}
+	set(OSX_MIN_VERSION "10.6")
-		${COCOA_LIBRARY} ${COREAUDIO_LIBRARY} ${COREFUND_LIBRARY}
+	set(TARGET_FLAGS "${TARGET_FLAGS} -mmacosx-version-min=${OSX_MIN_VERSION}")
-		${CORESERV_LIBRARY} ${IOB_LIBRARY} ${IOK_LIBRARY} ${OGL_LIBRARY}
+	set(SYSROOT_LEGACY_PATH "/Developer/SDKs/MacOSX10.6.sdk")
-		${WEBKIT_LIBRARY})
+	set(SYSROOT_PATH "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk")
+	if(EXISTS "${SYSROOT_PATH}/")
+        set(TARGET_SYSROOT ${SYSROOT_PATH})
+	elseif(EXISTS "${SYSROOT_LEGACY_PATH}/")
+        set(TARGET_SYSROOT ${SYSROOT_LEGACY_PATH})
+	endif()
+	if(TARGET_SYSROOT)
+        set(TARGET_FLAGS "${TARGET_FLAGS} -isysroot ${TARGET_SYSROOT}")
+        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -mmacosx-version-min=${OSX_MIN_VERSION} -Wl,-syslibroot,${TARGET_SYSROOT}")
+	endif()
+	# Do not warn about frameworks that are not available on all architectures.
+	# This avoids a warning when linking with QuickTime.
+	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-no_arch_warnings")
+	# Specify target CPUs.
+	set(TARGET_FLAGS "${TARGET_FLAGS} -Xarch_i386 -msse3")
+	set(TARGET_FLAGS "${TARGET_FLAGS} -Xarch_i386 -march=prescott")
+	set(TARGET_FLAGS "${TARGET_FLAGS} -Xarch_x86_64 -mssse3")
+	set(TARGET_FLAGS "${TARGET_FLAGS} -Xarch_x86_64 -march=core2")
+	# Target flags apply to both C and C++ compilation.
+	# CMake passes these to the compiler on the link command line as well.
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${TARGET_FLAGS}")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TARGET_FLAGS}")
+
+	# Linker flags.
+	# Drop unreachable code and data.
+	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-dead_strip,-dead_strip_dylibs")
+	# Reserve the minimum size for the zero page.
+	# Our JIT requires virtual memory space below 2GB, while the default zero
+	# page on x86_64 is 4GB in size.
+	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-pagezero_size,0x1000")
+
+	find_library(APPKIT_LIBRARY AppKit)
+	find_library(APPSERV_LIBRARY ApplicationServices)
+	find_library(ATB_LIBRARY AudioToolbox)
+	find_library(AU_LIBRARY AudioUnit)
+	find_library(CARBON_LIBRARY Carbon)
+	find_library(COCOA_LIBRARY Cocoa)
+	find_library(COREAUDIO_LIBRARY CoreAudio)
+	find_library(COREFUND_LIBRARY CoreFoundation)
+	find_library(CORESERV_LIBRARY CoreServices)
+	find_library(IOB_LIBRARY IOBluetooth)
+	find_library(IOK_LIBRARY IOKit)
+	find_library(QUICKTIME_LIBRARY QuickTime)
+	find_library(WEBKIT_LIBRARY WebKit)
 endif()
 
 if(WIN32)
@@ -144,6 +210,7 @@ if(FASTLOG)
 	add_definitions(-DDEBUGFAST)
 endif()
 
+add_definitions(-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE)
 
 ########################################
 # Dependency checking
@@ -234,7 +301,9 @@ else()
 	add_definitions(-DHAVE_X11=0)
 endif()
 
+if(X11_FOUND)
 	check_lib(XRANDR Xrandr)
+endif()
 if(XRANDR_FOUND)
 	add_definitions(-DHAVE_XRANDR=1)
 else()
@@ -303,43 +372,61 @@ include_directories(Source/Core/VideoUICommon/Src)
 add_subdirectory(Externals/Bochs_disasm)
 include_directories(Externals/Bochs_disasm)
 
+if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 	check_lib(LZO lzo2 lzo/lzo1x.h QUIET)
+endif()
 if(LZO_FOUND)
 	message("Using shared lzo")
 else()
-	message("Shared lzo not found, falling back to the static library")
+	message("Using static lzo from Externals")
 	add_subdirectory(Externals/LZO)
 	include_directories(Externals/LZO)
+	set(LZO lzo2)
 endif()
 
+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("Shared SDL not found, falling back to the static library")
+		message("Using static SDL from Externals")
 		include_directories(Externals/SDL Externals/SDL/include)
 		add_subdirectory(Externals/SDL)
 	endif(SDL_FOUND)
+endif(SDL2_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")
 	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("Shared SFML < 2.0 not found, falling back to the static library")
+       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(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 	check_lib(SOIL SOIL SOIL/SOIL.h QUIET)
+endif()
 if(SOIL_FOUND)
 	message("Using shared SOIL")
 else()
-	message("Shared SOIL not found, falling back to the static library")
+	message("Using static SOIL from Externals")
 	add_subdirectory(Externals/SOIL)
 	include_directories(Externals/SOIL)
 endif()
@@ -363,18 +450,29 @@ if(WIN32)
 	find_library(GLEW glew32s PATHS Externals/GLew)
 	include_directories(Externals/GLew/include)
 else()
+	if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 		check_lib(GLEW GLEW GL/glew.h)
+	endif()
 	if(NOT GLEW_FOUND)
-		message("Shared GLEW not found, falling back to the static library")
+		message("Using static GLEW from Externals")
 		add_subdirectory(Externals/GLew)
 		include_directories(Externals/GLew/include)
 	endif(NOT GLEW_FOUND)
 
+	if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 		check_lib(CG Cg Cg/cg.h)
+	endif()
+	if(NOT CG_FOUND)
+		message("Using static Cg from Externals")
+		include_directories(Externals)
+	endif(NOT CG_FOUND)
 	check_lib(CGGL CgGL Cg/cgGL.h)
 endif()
 
-if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+	find_library(CL OpenCL)
+	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-weak_framework,OpenCL")
+else()
 	include_directories(Externals/CLRun/include)
 	add_subdirectory(Externals/CLRun)
 endif()
@@ -382,10 +480,27 @@ endif()
 option(DISABLE_WX "Disable wxWidgets (use CLI interface)" OFF)
 if(NOT DISABLE_WX)
 	include(FindwxWidgets OPTIONAL)
-	FIND_PACKAGE(wxWidgets COMPONENTS core aui adv)
+	FIND_PACKAGE(wxWidgets COMPONENTS core aui adv gl)
 
 	if(wxWidgets_FOUND)
-		include(${wxWidgets_USE_FILE})
+		EXECUTE_PROCESS(
+			COMMAND sh "${wxWidgets_CONFIG_EXECUTABLE}"
+				${wxWidgets_CONFIG_OPTIONS} --version
+			OUTPUT_VARIABLE wxWidgets_VERSION
+			OUTPUT_STRIP_TRAILING_WHITESPACE
+			ERROR_QUIET
+			)
+		message("Found wxWidgets version ${wxWidgets_VERSION}")
+		if(UNIX AND NOT APPLE)
+			set(wxMIN_VERSION "2.9.3")
+		else()
+			set(wxMIN_VERSION "2.9.4")
+		endif()
+		if(${wxWidgets_VERSION} VERSION_LESS ${wxMIN_VERSION})
+			message("At least ${wxMIN_VERSION} is required; ignoring found version")
+			unset(wxWidgets_FOUND)
+		endif()
+	endif(wxWidgets_FOUND)
 
 	if(UNIX AND NOT APPLE)
 		# There is a bug in the FindGTK module in cmake version 2.8.2 that
@@ -408,14 +523,34 @@ if(NOT DISABLE_WX)
 		endif()
 	endif()
 
+	if(wxWidgets_FOUND)
+		include(${wxWidgets_USE_FILE})
 		message("wxWidgets found, enabling GUI build")
 	else(wxWidgets_FOUND)
-		if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+		message("Using static wxWidgets from Externals")
-			message(FATAL_ERROR "wxWidgets not found.  It is required to build the GUI")
+
+		# 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")
+			add_definitions(-D__WXOSX_COCOA__)
+		elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+			add_definitions(-D__WXGTK__)
+
+			# Check for required libs
+			check_lib(GTHREAD2 gthread-2.0 glib/gthread.h REQUIRED)
+			check_lib(PANGOCAIRO pangocairo pango/pangocairo.h REQUIRED)
+		elseif(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+			add_definitions(-D__WXMSW__)
+		else()
+			message(FATAL_ERROR "wxWidgets in Externals is not compatible with your platform")
 		endif()
-		message("Shared wxWidgets not found, falling back to the static library")
+		
-		include_directories(Externals/wxWidgets/include)
+		include_directories(
-		add_subdirectory(Externals/wxWidgets)
+			Externals/wxWidgets3
+			Externals/wxWidgets3/include)
+		add_subdirectory(Externals/wxWidgets3)
+		set(wxWidgets_FOUND TRUE)
+		set(wxWidgets_LIBRARIES "wx")
 	endif(wxWidgets_FOUND)
 	add_definitions(-DHAVE_WX=1)
 endif(NOT DISABLE_WX)
@@ -439,8 +574,6 @@ file(WRITE ${PROJECT_BINARY_DIR}/Source/Core/Common/Src/scmrev.h
 include_directories("${PROJECT_BINARY_DIR}/Source/Core/Common/Src")
 
 
-add_definitions(-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE)
-
 ########################################
 # Optional Targets
 # TODO: Add DSPSpy and TestSuite.
@@ -450,34 +583,32 @@ option(UNITTESTS "Build unitests" OFF)
 ########################################
 # Start compiling our code
 #
+add_definitions(-std=gnu++0x)
 add_subdirectory(Source)
 
 
 ########################################
 # Install shared data files
 #
-install(DIRECTORY Data/User/ DESTINATION ${datadir}/user PATTERN .svn EXCLUDE)
+if((NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin"))
-install(DIRECTORY Data/Sys/ DESTINATION ${datadir}/sys PATTERN .svn EXCLUDE)
+	install(DIRECTORY Data/User/ DESTINATION ${datadir}/user PATTERN)
+	install(DIRECTORY Data/Sys/ DESTINATION ${datadir}/sys PATTERN)
+endif()
 include(FindGettext)
 if(GETTEXT_FOUND AND NOT DISABLE_WX)
 	file(GLOB LINGUAS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} Languages/po/*.po) 
 	GETTEXT_CREATE_TRANSLATIONS(Languages/po/dolphin-emu.pot ALL ${LINGUAS})
 endif()
-if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+if((NOT ${CMAKE_SYSTEM_NAME} MATCHES "Linux|FreeBSD|Darwin"))
 	install(FILES Data/license.txt DESTINATION ${datadir})
 endif()
 
 # packaging information
 set(CPACK_PACKAGE_NAME "dolphin-emu")
 set(CPACK_PACKAGE_VENDOR "Dolphin Team")
-set(CPACK_PACKAGE_VERSION_MAJOR "3")
+set(CPACK_PACKAGE_VERSION_MAJOR ${DOLPHIN_VERSION_MAJOR})
-set(CPACK_PACKAGE_VERSION_MINOR "0")
+set(CPACK_PACKAGE_VERSION_MINOR ${DOLPHIN_VERSION_MINOR})
-
+set(CPACK_PACKAGE_VERSION_PATCH ${DOLPHIN_VERSION_PATCH})
-if(DOLPHIN_IS_STABLE)
-	set(CPACK_PACKAGE_VERSION_PATCH "0")
-else()
-	set(CPACK_PACKAGE_VERSION_PATCH ${DOLPHIN_WC_REVISION})
-endif()
 
 # TODO: CPACK_PACKAGE_DESCRIPTION_FILE
 # TODO: CPACK_PACKAGE_DESCRIPTION_SUMMARY

CMakeTests/CheckLib.cmake

@@ -55,14 +55,15 @@ endmacro()
 
 macro(check_libav)
 	if(PKG_CONFIG_FOUND)
-		pkg_check_modules(LIBAV libavcodec>=52.72.2 libavformat>=52.64.2
+		pkg_check_modules(LIBAV libavcodec>=53.35.0 libavformat>=53.21.0
-			libswscale>=0.11.0 libavutil>=50.15.1)
+			libswscale>=2.1.0 libavutil>=51.22.1)
 	else()
 		message("pkg-config is required to check for libav")
 	endif()
 	if(LIBAV_FOUND)
 		message("libav found, enabling AVI frame dumps")
 		add_definitions(-DHAVE_LIBAV)
+		include_directories(${LIBAV_INCLUDE_DIRS})
 	else()
 		message("libav not found, disabling AVI frame dumps")
 	endif()

CMakeTests/FindSDL2.cmake

@@ -0,0 +1,180 @@
+# Locate SDL2 library
+# This module defines
+# SDL2_LIBRARY, the name of the library to link against
+# SDL2_FOUND, if false, do not try to link to SDL2
+# SDL2_INCLUDE_DIR, where to find SDL.h
+#
+# This module responds to the the flag:
+# SDL2_BUILDING_LIBRARY
+# If this is defined, then no SDL2_main will be linked in because
+# only applications need main().
+# Otherwise, it is assumed you are building an application and this
+# module will attempt to locate and set the the proper link flags
+# as part of the returned SDL2_LIBRARY variable.
+#
+# Don't forget to include SDL2main.h and SDL2main.m your project for the
+# OS X framework based version. (Other versions link to -lSDL2main which
+# this module will try to find on your behalf.) Also for OS X, this
+# module will automatically add the -framework Cocoa on your behalf.
+#
+#
+# Additional Note: If you see an empty SDL2_LIBRARY_TEMP in your configuration
+# and no SDL2_LIBRARY, it means CMake did not find your SDL2 library
+# (SDL2.dll, libsdl2.so, SDL2.framework, etc).
+# Set SDL2_LIBRARY_TEMP to point to your SDL2 library, and configure again.
+# Similarly, if you see an empty SDL2MAIN_LIBRARY, you should set this value
+# as appropriate. These values are used to generate the final SDL2_LIBRARY
+# variable, but when these values are unset, SDL2_LIBRARY does not get created.
+#
+#
+# $SDL2DIR is an environment variable that would
+# correspond to the ./configure --prefix=$SDL2DIR
+# used in building SDL2.
+# l.e.galup  9-20-02
+#
+# Modified by Eric Wing.
+# Added code to assist with automated building by using environmental variables
+# and providing a more controlled/consistent search behavior.
+# Added new modifications to recognize OS X frameworks and
+# additional Unix paths (FreeBSD, etc).
+# Also corrected the header search path to follow "proper" SDL2 guidelines.
+# Added a search for SDL2main which is needed by some platforms.
+# Added a search for threads which is needed by some platforms.
+# Added needed compile switches for MinGW.
+#
+# On OSX, this will prefer the Framework version (if found) over others.
+# People will have to manually change the cache values of
+# SDL2_LIBRARY to override this selection or set the CMake environment
+# CMAKE_INCLUDE_PATH to modify the search paths.
+#
+# Note that the header path has changed from SDL2/SDL.h to just SDL.h
+# This needed to change because "proper" SDL2 convention
+# is #include "SDL.h", not <SDL2/SDL.h>. This is done for portability
+# reasons because not all systems place things in SDL2/ (see FreeBSD).
+#
+# Ported by Johnny Patterson. This is a literal port for SDL2 of the FindSDL.cmake
+# module with the minor edit of changing "SDL" to "SDL2" where necessary. This
+# was not created for redistribution, and exists temporarily pending official
+# SDL2 CMake modules.
+
+#=============================================================================
+# Copyright 2003-2009 Kitware, Inc.
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distribute this file outside of CMake, substitute the full
+#  License text for the above reference.)
+
+FIND_PATH(SDL2_INCLUDE_DIR SDL.h
+  HINTS
+  $ENV{SDL2DIR}
+  PATH_SUFFIXES include/SDL2 include
+  PATHS
+  ~/Library/Frameworks
+  /Library/Frameworks
+  /usr/local/include/SDL2
+  /usr/include/SDL2
+  /sw # Fink
+  /opt/local # DarwinPorts
+  /opt/csw # Blastwave
+  /opt
+)
+#MESSAGE("SDL2_INCLUDE_DIR is ${SDL2_INCLUDE_DIR}")
+
+FIND_LIBRARY(SDL2_LIBRARY_TEMP
+  NAMES SDL2
+  HINTS
+  $ENV{SDL2DIR}
+  PATH_SUFFIXES lib64 lib
+  PATHS
+  /sw
+  /opt/local
+  /opt/csw
+  /opt
+)
+
+#MESSAGE("SDL2_LIBRARY_TEMP is ${SDL2_LIBRARY_TEMP}")
+
+IF(NOT SDL2_BUILDING_LIBRARY)
+  IF(NOT ${SDL2_INCLUDE_DIR} MATCHES ".framework")
+    # Non-OS X framework versions expect you to also dynamically link to
+    # SDL2main. This is mainly for Windows and OS X. Other (Unix) platforms
+    # seem to provide SDL2main for compatibility even though they don't
+    # necessarily need it.
+    FIND_LIBRARY(SDL2MAIN_LIBRARY
+      NAMES SDL2main
+      HINTS
+      $ENV{SDL2DIR}
+      PATH_SUFFIXES lib64 lib
+      PATHS
+      /sw
+      /opt/local
+      /opt/csw
+      /opt
+    )
+  ENDIF(NOT ${SDL2_INCLUDE_DIR} MATCHES ".framework")
+ENDIF(NOT SDL2_BUILDING_LIBRARY)
+
+# SDL2 may require threads on your system.
+# The Apple build may not need an explicit flag because one of the
+# frameworks may already provide it.
+# But for non-OSX systems, I will use the CMake Threads package.
+IF(NOT APPLE)
+  FIND_PACKAGE(Threads)
+ENDIF(NOT APPLE)
+
+# MinGW needs an additional library, mwindows
+# It's total link flags should look like -lmingw32 -lSDL2main -lSDL2 -lmwindows
+# (Actually on second look, I think it only needs one of the m* libraries.)
+IF(MINGW)
+  SET(MINGW32_LIBRARY mingw32 CACHE STRING "mwindows for MinGW")
+ENDIF(MINGW)
+
+SET(SDL2_FOUND "NO")
+IF(SDL2_LIBRARY_TEMP)
+  # For SDL2main
+  IF(NOT SDL2_BUILDING_LIBRARY)
+    IF(SDL2MAIN_LIBRARY)
+      SET(SDL2_LIBRARY_TEMP ${SDL2MAIN_LIBRARY} ${SDL2_LIBRARY_TEMP})
+    ENDIF(SDL2MAIN_LIBRARY)
+  ENDIF(NOT SDL2_BUILDING_LIBRARY)
+
+  # For OS X, SDL2 uses Cocoa as a backend so it must link to Cocoa.
+  # CMake doesn't display the -framework Cocoa string in the UI even
+  # though it actually is there if I modify a pre-used variable.
+  # I think it has something to do with the CACHE STRING.
+  # So I use a temporary variable until the end so I can set the
+  # "real" variable in one-shot.
+  IF(APPLE)
+    SET(SDL2_LIBRARY_TEMP ${SDL2_LIBRARY_TEMP} "-framework Cocoa")
+  ENDIF(APPLE)
+
+  # For threads, as mentioned Apple doesn't need this.
+  # In fact, there seems to be a problem if I used the Threads package
+  # and try using this line, so I'm just skipping it entirely for OS X.
+  IF(NOT APPLE)
+    SET(SDL2_LIBRARY_TEMP ${SDL2_LIBRARY_TEMP} ${CMAKE_THREAD_LIBS_INIT})
+  ENDIF(NOT APPLE)
+
+  # For MinGW library
+  IF(MINGW)
+    SET(SDL2_LIBRARY_TEMP ${MINGW32_LIBRARY} ${SDL2_LIBRARY_TEMP})
+  ENDIF(MINGW)
+
+  # Set the final string here so the GUI reflects the final state.
+  SET(SDL2_LIBRARY ${SDL2_LIBRARY_TEMP} CACHE STRING "Where the SDL2 Library can be found")
+  # Set the temp variable to INTERNAL so it is not seen in the CMake GUI
+  SET(SDL2_LIBRARY_TEMP "${SDL2_LIBRARY_TEMP}" CACHE INTERNAL "")
+
+  SET(SDL2_FOUND "YES")
+ENDIF(SDL2_LIBRARY_TEMP)
+
+INCLUDE(FindPackageHandleStandardArgs)
+
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2
+                                  REQUIRED_VARS SDL2_LIBRARY SDL2_INCLUDE_DIR)

Data/User/GameConfig/G2BE5G.ini

@@ -2,6 +2,16 @@
 [Core] Values set here will override the main dolphin settings.
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = No sound/bad sound
+EmulationIssues = Needs LLE audio for sound ingame.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Settings]
+SafeTextureCacheColorSamples = 512

Data/User/GameConfig/G2BP7D.ini

@@ -2,5 +2,16 @@
 [Core] Values set here will override the main dolphin settings.
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
+EmulationIssues = Needs LLE audio for sound ingame.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Settings]
+SafeTextureCacheColorSamples = 512

Data/User/GameConfig/G2ME01.ini

@@ -2,8 +2,7 @@
 [EmuState]
 #The Emulation State.
 EmulationStateId = 4
-Issues="Scanner does not work, music is buggy, scanner mode is buggy"
+EmulationIssues = EFB to RAM is needed for the scanner/visors to work properly. 
-EmulationIssues = 
 [Speedhacks]
 0x803758bc=400
 [OnFrame]
@@ -131,6 +130,20 @@ $Have Ing Hive Temple Key 2
 4241FD80 011B0001
 $Have Ing Hive Temple Key 3
 4241FD80 011F0001
+$One Hit Kill
+0403DB68 4BFC539C
+04002F04 FFC00090
+04002F08 7C1BE050
+04002F0C 2C000010
+04002F10 41820008
+04002F14 EFDEF028
+04002F18 4803AC54
+$Full Logbook
+0421166C 4BDF18CC
+04002F38 3BE000FF
+04002F3C 9BE50004
+04002F40 88050004
+04002F44 4820E72C
 [Video]
 ProjectionHack = 0
 PH_SZNear = 0
@@ -140,7 +153,6 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Settings]
-SafeTextureCache = True
 SafeTextureCacheColorSamples = 512
 [Video_Hacks]
 EFBCopyEnable = True

Data/User/GameConfig/G2MP01.ini

@@ -1,15 +1,147 @@
-# G2MP01 - Metroid Prime 2 Echoes[EmuState]
+# G2MP01 - Metroid Prime 2 Echoes
+[EmuState]
 #The Emulation State.
-EmulationStateId = 2
+EmulationStateId = 4
-Issues="Scanner does not work, music is buggy, scanner mode is buggy"
+EmulationIssues = EFB to RAM is needed for the scanner/visors to work properly. 
 [Speedhacks]
 #Patch OSYieldThread to take more time - MP2's idle loop is really stupid.
 0x80375c68=400
 [OnFrame]
 [ActionReplay]
-[EmuState]
+$(M)
-EmulationStateId = 4
+C43552C8 0000FF01
-EmulationIssues = needs safe texture cache and EFB to Ram
+C436F41C 0000FF02
+0D30294C 4E800020
+C530294C 0000FF03
+$Infinite Health
+423DDE0C 000A44BB
+423DDE0C 000B6000
+$Max Energy Tanks
+423DDE0C 012B000E
+423DDE0C 012D000E
+$Maximum Missiles
+423DDE0C 013900FA
+$Infinite Missiles
+423DDE0C 013700FA
+$Moon Jump (Hold B)
+3A705F24 00000200
+423DDDFC 00D84101
+$Have Charge Beam
+423DDE0C 00310001
+423DDE0C 00330001
+$Have Dark Beam
+423DDE0C 00370001
+423DDE0C 00390001
+$Have Light Beam
+423DDE0C 003D0001
+423DDE0C 003F0001
+$Have Annihilator
+423DDE0C 00430001
+423DDE0C 00450001
+$Have Super Missile
+423DDE0C 00470001
+423DDE0C 00490001
+$Have Darkburst
+423DDE0C 004D0001
+423DDE0C 004F0001
+$Have Sunburst
+423DDE0C 00530001
+423DDE0C 00550001
+$Have Sonic Boom
+423DDE0C 00590001
+423DDE0C 005B0001
+$Have Combat Visor
+423DDE0C 005F0001
+423DDE0C 00610001
+$Have Scan Visor
+423DDE0C 00650001
+423DDE0C 00670001
+$Have Dark Visor
+423DDE0C 006B0001
+423DDE0C 006D0001
+$Have Echo Visor
+423DDE0C 00710001
+423DDE0C 00730001
+$Have Varia Suit
+423DDE0C 00770001
+423DDE0C 00790001
+$Have Dark Suit
+423DDE0C 007D0001
+423DDE0C 007F0001
+$Have Light Suit
+423DDE0C 00830001
+423DDE0C 00850001
+$Have Space Jump Boots
+423DDE0C 00BF0001
+423DDE0C 00C10001
+$Have Grapple Beam
+423DDE0C 00B90001
+423DDE0C 00BB0001
+$Have Gravity Boost
+423DDE0C 00C50001
+423DDE0C 00C70001
+$Have Screw Attack
+423DDE0C 00D10001
+423DDE0C 00D30001
+$Have Seeker Missile
+423DDE0C 00CB0001
+423DDE0C 00CD0001
+$Have Morph Ball Power Bomb
+423DDE0C 01310001
+423DDE0C 01330001
+$Have Beam Ammo Expansion
+423DDE0C 013D000F
+423DDE0C 013F000F
+$Have Sky Temple Key 1
+423DDE0C 00DD0001
+423DDE0C 00DF0001
+$Have Sky Temple Key 2
+423DDE0C 00E30001
+423DDE0C 00E50001
+$Have Sky Temple Key 3
+423DDE0C 00E90001
+423DDE0C 00EB0001
+$Have Agon Temple Key 1
+423DDE0C 00EF0001
+423DDE0C 00F10001
+$Have Agon Temple Key 2
+423DDE0C 00F50001
+423DDE0C 00F70001
+$Have Agon Temple Key 3
+423DDE0C 00FB0001
+423DDE0C 00FD0001
+$Have Torvus Temple Key 1
+423DDE0C 01010001
+423DDE0C 01030001
+$Have Torvus Temple Key 2
+423DDE0C 01070001
+423DDE0C 01090001
+$Have Torvus Temple Key 3
+423DDE0C 010D0001
+423DDE0C 010F0001
+$Have Ing Hive Temple Key 1
+423DDE0C 01130001
+423DDE0C 01150001
+$Have Ing Hive Temple Key 2
+423DDE0C 01190001
+423DDE0C 011B0001
+$Have Ing Hive Temple Key 3
+423DDE0C 011F0001
+423DDE0C 01210001
+$One Hit Kill
+0403DCB8 4BFC524C
+04002F04 FFC00090
+04002F08 7C1BE050
+04002F0C 2C000010
+04002F10 41820008
+04002F14 EFDEF028
+04002F18 4803ADA4
+$Full Logbook
+04211974 4BDF15C4
+04002F38 3BE000FF
+04002F3C 9BE50004
+04002F40 88050004
+04002F44 4820EA34
 [Video]
 ProjectionHack = 0
 PH_SZNear = 0
@@ -19,7 +151,6 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Settings]
-SafeTextureCache = True
 SafeTextureCacheColorSamples = 512
 [Video_Hacks]
 EFBCopyEnable = True

Data/User/GameConfig/G2OE41.ini

@@ -15,6 +15,5 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Settings]
-SafeTextureCache = True
 SafeTextureCacheColorSamples = 512
 

Data/User/GameConfig/G2OP41.ini

@@ -8,6 +8,11 @@ EmulationIssues =
 [ActionReplay] Add action replay cheats here.
 [Video]
 ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
 [Gecko]
 [Video_Settings]
-SafeTextureCache = True
+SafeTextureCacheColorSamples = 512

Data/User/GameConfig/G2XE8P.ini

@@ -1,8 +1,9 @@
 # G2XE8P - SONIC GEMS COLLECTION
 [Core] Values set here will override the main dolphin settings.
+TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Everything playable with minor glitches, except Sonic the Fighters.
+EmulationIssues = Everything playable with minor glitches.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
@@ -13,3 +14,7 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+[Video_Hacks]
+DlistCachingEnable = False

Data/User/GameConfig/G2XP8P.ini

@@ -1,8 +1,9 @@
 # G2XP8P - SONIC GEMS COLLECTION
 [Core] Values set here will override the main dolphin settings.
+TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Everything playable with minor glitches, except Sonic the Fighters.
+EmulationIssues = Everything playable with minor glitches.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
@@ -13,3 +14,7 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+[Video_Hacks]
+DlistCachingEnable = False

Data/User/GameConfig/G3AD69.ini

@@ -2,7 +2,7 @@
 [Core] Values set here will override the main dolphin settings.
 TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 0
+EmulationStateId = 4
 EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
@@ -15,4 +15,4 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Settings]
-SafeTextureCache = True
+SafeTextureCacheColorSamples = 0

Data/User/GameConfig/G3AE69.ini

@@ -2,7 +2,7 @@
 [Core] Values set here will override the main dolphin settings.
 TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 0
+EmulationStateId = 4
 EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
@@ -15,6 +15,4 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Settings]
-SafeTextureCache = True
+SafeTextureCacheColorSamples = 0
-SafeTextureCacheColorSamples = 512
-

Data/User/GameConfig/G3AF69.ini

@@ -2,7 +2,7 @@
 [Core] Values set here will override the main dolphin settings.
 TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 0
+EmulationStateId = 4
 EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
@@ -15,4 +15,4 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Settings]
-SafeTextureCache = True
+SafeTextureCacheColorSamples = 0

Data/User/GameConfig/G3AP69.ini

@@ -2,7 +2,7 @@
 [Core] Values set here will override the main dolphin settings.
 TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 0
+EmulationStateId = 4
 EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
@@ -15,4 +15,4 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Settings]
-SafeTextureCache = True
+SafeTextureCacheColorSamples = 0

Data/User/GameConfig/G3FE69.ini

@@ -18,7 +18,6 @@ MMU = 1
 VBeam = 1
 BlockMerging = 1
 [Video_Settings]
-SafeTextureCache = True
 SafeTextureCacheColorSamples = 0
 [Video_Hacks]
 DlistCachingEnable = False

Data/User/GameConfig/G3FF69.ini

@@ -18,7 +18,6 @@ MMU = 1
 VBeam = 1
 BlockMerging = 1
 [Video_Settings]
-SafeTextureCache = True
 SafeTextureCacheColorSamples = 0
 [Video_Hacks]
 DlistCachingEnable = False

Data/User/GameConfig/G3FP69.ini

@@ -18,7 +18,6 @@ MMU = 1
 VBeam = 1
 BlockMerging = 1
 [Video_Settings]
-SafeTextureCache = True
 SafeTextureCacheColorSamples = 0
 [Video_Hacks]
 DlistCachingEnable = False

Data/User/GameConfig/G3LE8P.ini

@@ -0,0 +1,15 @@
+# G3LE8P - Super Monkey Ball Adventures (TM)
+[Core] Values set here will override the main dolphin settings.
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 0
+EmulationIssues = 
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]

Data/User/GameConfig/G3XE52.ini

@@ -15,6 +15,5 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Settings]
-SafeTextureCache = True
 SafeTextureCacheColorSamples = 512
 

Data/User/GameConfig/G3XP52.ini

@@ -8,6 +8,11 @@ EmulationIssues =
 [ActionReplay] Add action replay cheats here.
 [Video]
 ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
 [Gecko]
 [Video_Settings]
-SafeTextureCache = True
+SafeTextureCacheColorSamples = 512

Data/User/GameConfig/G4AEE9.ini

@@ -7,7 +7,6 @@ EmulationStateId = 4
 EmulationIssues = 
 [OnFrame]#Add memory patches here.
 [Video_Enhancements]
-PostProcessingShader = 
 [Video_Hacks]
 DlistCachingEnable = False
 [Video]

Data/User/GameConfig/G4FD69.ini

@@ -1,11 +1,16 @@
 # G4FD69 - FIFA 07
 [Core] Values set here will override the main dolphin settings.
-MMU = 1
+TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Sound issues need LLE plugin and videos are messed up. Slow due to MMU(r6932)
+EmulationIssues = Sound issues need LLE audio to be fixed and the videos are messed up.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
 ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
 [Gecko]

Data/User/GameConfig/G4FE69.ini

@@ -1,12 +1,16 @@
 # G4FE69 - FIFA 07
 [Core] Values set here will override the main dolphin settings.
-MMU = 1
+TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
+EmulationStateId = 4
-EmulationIssues = Sound issues need LLE plugin and videos are messed up. Slow due to MMU(r6932)
+EmulationIssues = Sound issues need LLE audio to be fixed and the videos are messed up.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
 ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
 [Gecko]
-

Data/User/GameConfig/G4FF69.ini

@@ -1,11 +1,16 @@
 # G4FF69 - FIFA 07
 [Core] Values set here will override the main dolphin settings.
-MMU = 1
+TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Sound issues need LLE plugin and videos are messed up. Slow due to MMU(r6932)
+EmulationIssues = Sound issues need LLE audio to be fixed and the videos are messed up.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
 ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
 [Gecko]

Data/User/GameConfig/G4FP69.ini

@@ -1,11 +1,16 @@
 # G4FE69 - FIFA 07
 [Core] Values set here will override the main dolphin settings.
-MMU = 1
+TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Sound issues need LLE plugin and videos are messed up. Slow due to MMU(r6932)
+EmulationIssues = Sound issues need LLE audio to be fixed and the videos are messed up.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
 ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
 [Gecko]

Data/User/GameConfig/G4ME69.ini

@@ -15,6 +15,5 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Settings]
-SafeTextureCache = True
 SafeTextureCacheColorSamples = 512
 

Data/User/GameConfig/G4MP69.ini

@@ -15,4 +15,4 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Settings]
-SafeTextureCache = True
+SafeTextureCacheColorSamples = 512

Data/User/GameConfig/G4SE01.ini

@@ -14,6 +14,5 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Settings]
-SafeTextureCache = True
 SafeTextureCacheColorSamples = 512
 

Data/User/GameConfig/G4SP01.ini

@@ -105,4 +105,4 @@ $Have Power Bracelet
 ProjectionHack = 0
 [Gecko]
 [Video_Settings]
-SafeTextureCache = True
+SafeTextureCacheColorSamples = 512

Data/User/GameConfig/G5DE78.ini

@@ -0,0 +1,16 @@
+# G5DE78 - Scooby-Doo! Unmasked
+[Core] Values set here will override the main dolphin settings.
+TLBHack = 1
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]

Data/User/GameConfig/G5DP78.ini

@@ -0,0 +1,16 @@
+# G5DP78 - Scooby-Doo! Unmasked
+[Core] Values set here will override the main dolphin settings.
+TLBHack = 1
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]

Data/User/GameConfig/G6TE5G.ini

@@ -15,5 +15,4 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Settings]
-SafeTextureCache = True
 SafeTextureCacheColorSamples = 512

Data/User/GameConfig/G6TP5G.ini

@@ -15,4 +15,4 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Settings]
-SafeTextureCache = True
+SafeTextureCacheColorSamples = 512

Data/User/GameConfig/G8FE8P.ini

@@ -0,0 +1,15 @@
+# G8FE8P - VIRTUA QUEST
+[Core] Values set here will override the main dolphin settings.
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues = 
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]

Data/User/GameConfig/G8ME01.ini

@@ -6,7 +6,7 @@
 [EmuState]
 #The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = 
+EmulationIssues = Needs Efb to Ram for BBox (proper graphics).
 [OnFrame]
 [ActionReplay]
 $(M) Must Be ON
@@ -41,5 +41,15 @@ $Max Gold
 $Max Shop Points
 026EE7F0 000003E7
 [Video]
+UseBBox = 1
 ProjectionHack = 0
-
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Video_Hacks]
+DlistCachingEnable = False
+EFBToTextureEnable = False
+EFBCopyEnable = True
+[Gecko]

Data/User/GameConfig/G8MJ01.ini

@@ -0,0 +1,13 @@
+# G8MJ01 - Paper Mario
+[Core] Values set here will override the main dolphin settings.
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs Efb to Ram for BBox (proper graphics).
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+UseBBox = True
+[Video_Hacks]
+DlistCachingEnable = False
+EFBToTextureEnable = False
+EFBCopyEnable = True

Data/User/GameConfig/G8MP01.ini

@@ -2,5 +2,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 = Needs Efb to Ram for BBox (proper graphics).
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
+[Video]
+UseBBox = True
+[Video_Hacks]
+DlistCachingEnable = False
+EFBToTextureEnable = False
+EFBCopyEnable = True

Data/User/GameConfig/G9SE8P.ini

@@ -2,7 +2,7 @@
 [Core] Values set here will override the main dolphin settings.
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Use directx11 plugin set at 1x efb scale to deal with black textures. Safe texture cache to "safe" for some garbled text(r6479)
+EmulationIssues = Use directx11 backend with efb scale set at 1x to deal with black textures ingame.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
@@ -14,7 +14,5 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Settings]
-SafeTextureCache = True
 SafeTextureCacheColorSamples = 0
 EFBScale = 2
-

Data/User/GameConfig/G9SJ8P.ini

@@ -2,7 +2,7 @@
 [Core] Values set here will override the main dolphin settings.
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Use directx11 plugin set at 1x efb scale to deal with black textures. Safe texture cache to "safe" for some garbled text(r6479)
+EmulationIssues = Use directx11 backend with efb scale set at 1x to deal with black textures ingame.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
@@ -14,6 +14,5 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Settings]
-SafeTextureCache = True
 SafeTextureCacheColorSamples = 0
 EFBScale = 2

Data/User/GameConfig/G9SP8P.ini

@@ -2,7 +2,7 @@
 [Core] Values set here will override the main dolphin settings.
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Use directx11 plugin set at 1x efb scale to deal with black textures. Safe texture cache to "safe" for some garbled text(r6479)
+EmulationIssues = Use directx11 backend with efb scale set at 1x to deal with black textures ingame.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
@@ -14,6 +14,5 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Settings]
-SafeTextureCache = True
 SafeTextureCacheColorSamples = 0
 EFBScale = 2

Data/User/GameConfig/GAFE01.ini

@@ -317,7 +317,6 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Settings]
-SafeTextureCache = True
 SafeTextureCacheColorSamples = 512
 [Core]
 FastDiscSpeed = 1

Data/User/GameConfig/GAFJ01.ini

@@ -14,7 +14,6 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Settings]
-SafeTextureCache = True
 SafeTextureCacheColorSamples = 512
 [Core]
 FastDiscSpeed = 1

Data/User/GameConfig/GAFP01.ini

@@ -14,7 +14,6 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Settings]
-SafeTextureCache = True
 SafeTextureCacheColorSamples = 512
 [Core]
 FastDiscSpeed = 1

Data/User/GameConfig/GAFU01.ini

@@ -14,7 +14,6 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Settings]
-SafeTextureCache = True
 SafeTextureCacheColorSamples = 512
 [Core]
 FastDiscSpeed = 1

Data/User/GameConfig/GAUE08.ini

@@ -2,9 +2,15 @@
 [Core] Values set here will override the main dolphin settings.
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 5
-EmulationIssues = Use Real XFB and Safe texture cache
+EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
 [ActionReplay] Add action replay cheats here.
 $Master Code
 C40EBABC 0000FF00
@@ -58,6 +64,5 @@ $C-Stick Sends All Car Back To Start
 00000000 00070B60
 [Video_Settings]
 UseXFB = True
-UseRealXFB = True
+UseRealXFB = False
-SafeTextureCache = True
+[Gecko]
-

Data/User/GameConfig/GAUJ08.ini

@@ -2,11 +2,17 @@
 [Core] Values set here will override the main dolphin settings.
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 5
-EmulationIssues = Use Real XFB and Safe texture cache
+EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
 [ActionReplay] Add action replay cheats here.
 [Video_Settings]
 UseXFB = True
-UseRealXFB = True
+UseRealXFB = False
-SafeTextureCache = True
+[Gecko]

Data/User/GameConfig/GAVE78.ini

@@ -10,6 +10,5 @@ EmulationIssues =
 ProjectionHack = 0
 [Gecko]
 [Video_Settings]
-SafeTextureCache = True
 SafeTextureCacheColorSamples = 512
 

Data/User/GameConfig/GAVP78.ini

@@ -0,0 +1,18 @@
+# GAVP78 - Avatar: The Legend of Aang
+[Core] Values set here will override the main dolphin settings.
+TLBHack = 1
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues = 
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Settings]
+SafeTextureCacheColorSamples = 512

Data/User/GameConfig/GAVY78.ini

@@ -0,0 +1,18 @@
+# GAVE78 - Avatar: The Legend of Aang
+[Core] Values set here will override the main dolphin settings.
+TLBHack = 1
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues = 
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Settings]
+SafeTextureCacheColorSamples = 512

Data/User/GameConfig/GAXE5D.ini

@@ -0,0 +1,16 @@
+# GAXE5D - The Ant Bully
+[Core] Values set here will override the main dolphin settings.
+TLBHack = 1
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]

Data/User/GameConfig/GBLE52.ini

@@ -1,7 +1,18 @@
 # GBLE52 - BLOODY ROAR(R): PRIMAL FURY
 [Core] Values set here will override the main dolphin settings.
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Black screen afther logos
+EmulationIssues = Needs real xfb for videos to display and LLE audio for video sound.
-EmulationStateId = 1
+EmulationStateId = 4
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True

Data/User/GameConfig/GBLP52.ini

@@ -1,10 +1,18 @@
 # GBLP52 - BLOODY ROAR(R): PRIMAL FURY
-
+[Core] Values set here will override the main dolphin settings.
-[EmuState]
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-#The Emulation State.
+EmulationIssues = Needs real xfb for videos to display and LLE audio for video sound.
-EmulationStateId = 2
+EmulationStateId = 4
-EmulationIssues = 60Hz Display only
+[OnFrame] Add memory patches to be applied every frame here.
-[OnFrame]
+[ActionReplay] Add action replay cheats here.
-[ActionReplay]
 [Video]
 ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True

Data/User/GameConfig/GBME7F.ini

@@ -2,7 +2,7 @@
 [Core] Values set here will override the main dolphin settings.
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Use direct3d 9 backend or disable dual core. Needs real xfb for videos to show up and "LLE audio" to hear audio during videos.(r7446)
+EmulationIssues = Needs real xfb for videos to show up and "LLE audio" for sound during videos.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
@@ -16,4 +16,3 @@ PH_ZFar =
 [Video_Settings]
 UseXFB = True
 UseRealXFB = True
-

Data/User/GameConfig/GBMP7F.ini

@@ -2,7 +2,7 @@
 [Core] Values set here will override the main dolphin settings.
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Use direct3d 9 backend or disable dual core. Needs real xfb for videos to show up and "LLE audio" to hear audio during videos.(r7446)
+EmulationIssues = Needs real xfb for videos to show up and "LLE audio" for sound during videos.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]

Data/User/GameConfig/GBWD64.ini

@@ -0,0 +1,19 @@
+# GBWD64 - Star Wars Bounty Hunter
+[Core] Values set here will override the main dolphin settings.
+TLBHack = 1
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs real xfb for videos to show up.
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True

Data/User/GameConfig/GBWE64.ini

@@ -2,11 +2,18 @@
 [Core] Values set here will override the main dolphin settings.
 TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 0
+EmulationStateId = 4
-EmulationIssues = 
+EmulationIssues = Needs real xfb for videos to show up.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
 ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
 [Gecko]
-
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True

Data/User/GameConfig/GBWF64.ini

@@ -0,0 +1,19 @@
+# GBWF64 - Star Wars Bounty Hunter
+[Core] Values set here will override the main dolphin settings.
+TLBHack = 1
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs real xfb for videos to show up.
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True

Data/User/GameConfig/GBWP64.ini

@@ -0,0 +1,19 @@
+# GBWP64 - Star Wars Bounty Hunter
+[Core] Values set here will override the main dolphin settings.
+TLBHack = 1
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs real xfb for videos to show up.
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True

Data/User/GameConfig/GBZP08.ini

@@ -5,6 +5,66 @@ EmulationStateId = 5
 EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
+$Can always save
+04153E00 38000037
+04153A50 60000000
+$Zero saves
+0233B832 00000000
+$Have all maps
+022961C2 0000FFFF
+$Have all files
+022961C0 0000FFFB
+022961C6 0000FFFF
+$Timers don't decrease
+043835C0 00015F91
+$Infinite Ammo (All slots)
+04152D34 3BC00063
+04152D60 60000000
+$Infinite health (REBECCA)
+0431CA4C 00000100
+$Infinite Ammo [All Slots] (R)
+023272EA 00000063
+023272EE 00000063
+023272F2 00000063
+023272F6 00000063
+023272FA 00000063
+023272FE 00000063
+$Slot 1/2: Hunting gun (R)
+023272E8 00000005
+$Slot 1/2: Shotgun (R)
+023272E8 00000006
+$Slot 1/2: Grenade Launcher (R)
+023272E8 00000007
+$Slot 1/2: Sub-machine gun (R)
+023272E8 0000000B
+$Slot 1/2: Rocket Launcher (R)
+023272E8 00000017
+$Slot 3: Magnum Revolver (R)
+023272F0 00000016
+$Slot 4: Moltov cocktails (R)
+023272F4 0000000E
+$Infinite health (BILLY)
+0231CC76 00000100
+$Slot 1/2: Hunting gun (B)
+02327308 00000005
+$Slot 1/2: Shotgun (B)
+02327308 00000006
+$Slot 1/2: Grenade Launcher (B)
+02327308 00000007
+$Slot 1/2: Sub-machine gun (B)
+02327308 0000000B
+$Slot 1/2: Rocket Launcher (B)
+02327308 00000017
+$Slot 3: Magnum Revolver (B)
+02327310 00000016
+$Infinite Ammo [All Slots] (B)
+0232730A 00000063
+0232730E 00000063
+02327312 00000063
+02327316 00000063
+0232731A 00000063
+0232731E 00000063
+$Slot 4: Moltov cocktails (B)
+02327214 0000000E
 [Video]
-Hack = -1
 ProjectionHack = 0

Data/User/GameConfig/GC3D78.ini

@@ -0,0 +1,16 @@
+# GC3D78 - Scooby-Doo!(tm) Mystery Mayhem
+[Core] Values set here will override the main dolphin settings.
+TLBHack = 1
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]

Data/User/GameConfig/GC3E78.ini

@@ -0,0 +1,16 @@
+# GC3E78 - Scooby-Doo!(tm) Mystery Mayhem
+[Core] Values set here will override the main dolphin settings.
+TLBHack = 1
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]

Data/User/GameConfig/GC3F78.ini

@@ -0,0 +1,16 @@
+# GC3F78 - Scooby-Doo!(tm) Mystery Mayhem
+[Core] Values set here will override the main dolphin settings.
+TLBHack = 1
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]

Data/User/GameConfig/GC3P78.ini

@@ -0,0 +1,16 @@
+# GC3P78 - Scooby-Doo!(tm) Mystery Mayhem
+[Core] Values set here will override the main dolphin settings.
+TLBHack = 1
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]

Data/User/GameConfig/GC6E01.ini

@@ -15,6 +15,5 @@ PH_ZFar =
 [Gecko]
 [Video_Settings]
 EFBScale = 1
-SafeTextureCache = True
 SafeTextureCacheColorSamples = 0
 

Data/User/GameConfig/GC6P01.ini

@@ -15,5 +15,4 @@ PH_ZFar =
 [Gecko]
 [Video_Settings]
 EFBScale = 1
-SafeTextureCache = True
 SafeTextureCacheColorSamples = 0

Data/User/GameConfig/GC9P6S.ini

@@ -7,4 +7,4 @@ EmulationIssues = Need ZTP BLoom Hack and Safe Texture Cache
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video_Settings]
-SafeTextureCache = True
+SafeTextureCacheColorSamples = 512

Data/User/GameConfig/GCCE01.ini

@@ -299,9 +299,7 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Settings]
-SafeTextureCache = True
 SafeTextureCacheColorSamples = 512
 [Video_Enhancements]
-PostProcessingShader =
 [Video_Hacks]
 EFBEmulateFormatChanges = True

Data/User/GameConfig/GCCP01.ini

@@ -16,7 +16,6 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Settings]
-SafeTextureCache = True
 SafeTextureCacheColorSamples = 512
 [Video_Hacks]
 EFBEmulateFormatChanges = True

Data/User/GameConfig/GCNE7D.ini

@@ -2,9 +2,9 @@
 [Core] Values set here will override the main dolphin settings.
 TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
+EmulationStateId = 4
 Issues =
-EmulationIssues = 
+EmulationIssues = Disable "Panic Handlers". Needs "Real Xfb" to display videos.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]

Data/User/GameConfig/GCPE6S.ini

@@ -1,7 +1,20 @@
 # GCPE6S - CASPER
 [Core] Values set here will override the main dolphin settings.
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
+EmulationStateId = 4
-EmulationIssues = 
+EmulationIssues = Needs real xfb for videos to appear and LLE audio for them to have sound.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
+[Video_Hacks]
+DlistCachingEnable = False

Data/User/GameConfig/GCPP6S.ini

@@ -1,10 +1,20 @@
 # GCPP6S - Casper Spirit Dimensions
 [Core] Values set here will override the main dolphin settings.
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 2
+EmulationStateId = 4
-EmulationIssues = Bad transparencies
+EmulationIssues = Needs real xfb for videos to appear and LLE audio for them to have sound.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
 ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
 [Gecko]
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
+[Video_Hacks]
+DlistCachingEnable = False

Data/User/GameConfig/GCZE69.ini

@@ -1,17 +1,19 @@
 # GCZE69 - CATWOMAN
 [Core] Values set here will override the main dolphin settings.
 TLBHack = 1
-MMU = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Needs MMU and is slow (r6898)
+EmulationIssues = 
 EmulationStateId = 4
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
 ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
 [Gecko]
 [Video_Settings]
-SafeTextureCache = True
 SafeTextureCacheColorSamples = 512
 [Video_Enhancements]
-PostProcessingShader = 

Data/User/GameConfig/GCZP69.ini

@@ -1,14 +1,19 @@
 # GCZP69 - CATWOMAN
 [Core] Values set here will override the main dolphin settings.
 TLBHack = 1
-MMU = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Needs MMU and is slow (r6898)
+EmulationIssues = 
 EmulationStateId = 4
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
 ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
 [Gecko]
 [Video_Settings]
-SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
+[Video_Enhancements]

Data/User/GameConfig/GDEE71.ini

@@ -16,5 +16,4 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Settings]
-SafeTextureCache = True
 SafeTextureCacheColorSamples = 512

Data/User/GameConfig/GDGE7H.ini

@@ -0,0 +1,19 @@
+# GDGE7H - Dragon's Lair 3D
+[Core] Values set here will override the main dolphin settings.
+TLBHack = 1
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs Real Xfb for videos to show up.
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True

Data/User/GameConfig/GDGP78.ini

@@ -1,6 +1,19 @@
 # GDGP78 - Dragon's Lair 3D
 [Core] Values set here will override the main dolphin settings.
+TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 2
+EmulationStateId = 4
+EmulationIssues = Needs Real Xfb for videos to show up.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True

Data/User/GameConfig/GEAE8P.ini

@@ -2,7 +2,7 @@
 [Core] Values set here will override the main dolphin settings.
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = 
+EmulationIssues = LLE audio is needed to fix sound issues. Gfx glitches.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
@@ -14,6 +14,7 @@ PH_ZNear =
 PH_ZFar = 1.99998
 [Gecko]
 [Video_Settings]
-SafeTextureCache = True
 SafeTextureCacheColorSamples = 512
-
+[Video_Hacks]
+EFBToTextureEnable = False
+EFBCopyEnable = True

Data/User/GameConfig/GEAP8P.ini

@@ -2,7 +2,7 @@
 [Core] Values set here will override the main dolphin settings.
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = 
+EmulationIssues = LLE audio is needed to fix sound issues. Gfx glitches.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
@@ -14,4 +14,7 @@ PH_ZNear =
 PH_ZFar = 1.99998
 [Gecko]
 [Video_Settings]
-SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
+[Video_Hacks]
+EFBToTextureEnable = False
+EFBCopyEnable = True

Data/User/GameConfig/GEDE01.ini

@@ -14,5 +14,4 @@ PH_ZNear = 5
 PH_ZFar = 0.15
 [Gecko]
 [Video_Settings]
-SafeTextureCache = True
 SafeTextureCacheColorSamples = 512

Data/User/GameConfig/GEDP01.ini

@@ -14,5 +14,4 @@ PH_ZNear = 5
 PH_ZFar = 0.15
 [Gecko]
 [Video_Settings]
-SafeTextureCache = True
 SafeTextureCacheColorSamples = 512

Data/User/GameConfig/GEND69.ini

@@ -0,0 +1,18 @@
+# GEND69 - 007: Everything or Nothing
+[Core] Values set here will override the main dolphin settings.
+TLBHack = 1
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Needs LLE audio for proper sound.
+EmulationStateId = 4
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Settings]
+SafeTextureCacheColorSamples = 512

Data/User/GameConfig/GENE69.ini

@@ -2,11 +2,17 @@
 [Core] Values set here will override the main dolphin settings.
 TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Missing Textures,3D Models Broken cutscenes
+EmulationIssues = Needs LLE audio for proper sound.
-EmulationStateId = 2
+EmulationStateId = 4
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
 ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
 [Gecko]
-
+[Video_Settings]
+SafeTextureCacheColorSamples = 512

Data/User/GameConfig/GENP69.ini

@@ -0,0 +1,18 @@
+# GENP69 - 007: Everything or Nothing
+[Core] Values set here will override the main dolphin settings.
+TLBHack = 1
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Needs LLE audio for proper sound.
+EmulationStateId = 4
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Settings]
+SafeTextureCacheColorSamples = 512

Data/User/GameConfig/GENS69.ini

@@ -2,10 +2,17 @@
 [Core] Values set here will override the main dolphin settings.
 TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Missing Textures,3D Models Broken cutscenes
+EmulationIssues = Needs LLE audio for proper sound.
-EmulationStateId = 2
+EmulationStateId = 4
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
 ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
 [Gecko]
+[Video_Settings]
+SafeTextureCacheColorSamples = 512

Data/User/GameConfig/GEOE08.ini

@@ -8,7 +8,6 @@ EmulationIssues = GFX glitches
 [Video_Settings]
 UseXFB = True
 UseRealXFB = False
-SafeTextureCache = True
 SafeTextureCacheColorSamples = 512
 EFBScale = 0
 [Video]

Data/User/GameConfig/GEOP08.ini

@@ -8,7 +8,6 @@ EmulationIssues = GFX glitches
 [Video_Settings]
 UseXFB = True
 UseRealXFB = False
-SafeTextureCache = True
 SafeTextureCacheColorSamples = 512
 EFBScale = 0
 [Video]

Data/User/GameConfig/GEYE69.ini

@@ -1,6 +1,16 @@
 # GEYE69 - EA SPORTS(TM) Fight Night Round 2
 [Core] Values set here will override the main dolphin settings.
+TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 1
+EmulationStateId = 4
+EmulationIssues = Videos are messed up, needs LLE audio for proper sound.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]

Data/User/GameConfig/GEZE8P.ini

@@ -14,8 +14,6 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Settings]
-SafeTextureCache = True
 SafeTextureCacheColorSamples = 512
 [Video_Enhancements]
-PostProcessingShader = 
 [Video_Hacks]

Data/User/GameConfig/GEZP8P.ini

@@ -14,8 +14,6 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Settings]
-SafeTextureCache = True
 SafeTextureCacheColorSamples = 512
 [Video_Enhancements]
-PostProcessingShader = 
 [Video_Hacks]

Data/User/GameConfig/GF5E69.ini

@@ -1,13 +1,16 @@
 # GF5E69 - FIFA Soccer 2005
 [Core] Values set here will override the main dolphin settings.
 TLBHack = 1
-MMU = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Sound issues need LLE plugin and videos are messed up. Slow due to MMU(r6932)
+EmulationIssues = Sound issues need LLE audio to be fixed and the videos are messed up.
-EmulationStateId = 3
+EmulationStateId = 4
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
 ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
 [Gecko]
-

Data/User/GameConfig/GF6E69.ini

@@ -1,12 +1,16 @@
 # GF6E69 - FIFA 06
 [Core] Values set here will override the main dolphin settings.
-MMU = 1
+TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
+EmulationStateId = 4
-EmulationIssues = Sound issues need LLE plugin and videos are messed up. Slow due to MMU(r6932)
+EmulationIssues = Sound issues need LLE audio to be fixed and the videos are messed up.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
 ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
 [Gecko]
-

Data/User/GameConfig/GF6F69.ini

@@ -1,11 +1,16 @@
 # GF6F69 - FIFA 06
 [Core] Values set here will override the main dolphin settings.
-MMU = 1
+TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Sound issues need LLE plugin and videos are messed up. Slow due to MMU(r6932)
+EmulationIssues = Sound issues need LLE audio to be fixed and the videos are messed up.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
 ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
 [Gecko]

Data/User/GameConfig/GF7E01.ini

@@ -78,7 +78,6 @@ PH_ZFar =
 [Gecko]
 [Video_Settings]
 EFBScale = 1
-SafeTextureCache = True
 SafeTextureCacheColorSamples = 512
 [Video_Hacks]
 EFBToTextureEnable = False

Data/User/GameConfig/GF7P01.ini

@@ -75,7 +75,6 @@ PH_ZFar =
 [Gecko]
 [Video_Settings]
 EFBScale = 1
-SafeTextureCache = True
 SafeTextureCacheColorSamples = 512
 [Video_Hacks]
 EFBToTextureEnable = False

Data/User/GameConfig/GFAD69.ini

@@ -0,0 +1,16 @@
+# GFAD69 - FIFA 2003
+[Core] Values set here will override the main dolphin settings.
+TLBHack = 1
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Sound issues need LLE plugin and videos are messed up.
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]

Data/User/GameConfig/GFAE69.ini

@@ -0,0 +1,16 @@
+# GFAE69 - FIFA 2003
+[Core] Values set here will override the main dolphin settings.
+TLBHack = 1
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Sound issues need LLE plugin and videos are messed up.
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]

Data/User/GameConfig/GFAP69.ini

@@ -0,0 +1,16 @@
+# GFAP69 - FIFA 2003
+[Core] Values set here will override the main dolphin settings.
+TLBHack = 1
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Sound issues need LLE plugin and videos are messed up.
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]