Merge branch 'master' into videosoftware-xfb

Conflicts:
	Source/Core/VideoBackends/Software/Src/EfbCopy.cpp
	Source/Core/VideoBackends/Software/Src/SWRenderer.cpp
	Source/Core/VideoBackends/Software/Src/SWRenderer.h
	Source/Core/VideoBackends/Software/Src/SWVideoConfig.cpp
	Source/Core/VideoBackends/Software/Src/SWmain.cpp

.gitignore

@@ -1,41 +1,22 @@
-
-#ignore thumbnails created by windows
+# Ignore files created by windows
 Thumbs.db
-#Ignore files built by Visual Studio
-*.obj
-*.exe
-*.pdb
-*.user
-*.aps
-*.pch
-*.vspscc
-*_i.c
-*_p.c
-*.ncb
-*.suo
-*.tlb
-*.tlh
-*.bak
-*.cache
-*.ilk
-*.log
-[Bb]in
-[Dd]ebug*/
-*.lib
-*.sbr
-obj/
-[Rr]elease*/
-_ReSharper*/
-[Tt]est[Rr]esult*
-Binary
+# Ignore files created by OS X
+.DS_Store
+# Ignore autogenerated source files
 Source/Core/Common/Src/scmrev.h
+# Ignore files output by build
+/[Bb]uild/
+/[Bb]inary/
+# Ignore files created by visual studio
+*.ipch
 *.opensdf
 *.sdf
-[Bb]uild
-*.ipch
-.sconsign.dblite
-Externals/scons-local/*
-.DS_Store
+*.suo
+*.vcxproj.user
+*.obj
+# Ignore files created by posix people
 *~
-#Ignore transifix configuration directory
+# Ignore transifix configuration directory
 .tx
+# Ignore tlog files
+*.tlog

.hgeol

@@ -1,3 +0,0 @@
-[patterns]
-Data/User/Wii/**.* = BIN
-** = native

.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

CMakeLists.txt

@@ -11,6 +11,7 @@ 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(ENABLE_PCH "Use PCH to speed up compilation" ON)
 
 option(FASTLOG "Enable all logs" OFF)
 option(OPROFILING "Enable profiling" OFF)
@@ -25,11 +26,17 @@ option(UNITTESTS "Build unitests" OFF)
 # Update compiler before calling project()
 if (APPLE)
 	# Use clang compiler
-	set(CMAKE_C_COMPILER "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang")
-	set(CMAKE_CXX_COMPILER "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++")
-	if (NOT EXISTS "${CMAKE_CXX_COMPILER}")
-		set(CMAKE_C_COMPILER "clang")
-		set(CMAKE_CXX_COMPILER "clang++")
+	if (NOT DEFINED CMAKE_CXX_COMPILER)
+		set(CMAKE_CXX_COMPILER "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++")
+		if (NOT EXISTS "${CMAKE_CXX_COMPILER}")
+			set(CMAKE_CXX_COMPILER "clang++")
+		endif()
+	endif()
+	if (NOT DEFINED CMAKE_CXX_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)
@@ -104,8 +111,8 @@ if(GIT_FOUND AND NOT DOLPHIN_WC_REVISION)
 endif()
 
 # version number
-set(DOLPHIN_VERSION_MAJOR "3")
-set(DOLPHIN_VERSION_MINOR "5")
+set(DOLPHIN_VERSION_MAJOR "4")
+set(DOLPHIN_VERSION_MINOR "0")
 if(DOLPHIN_IS_STABLE)
 	set(DOLPHIN_VERSION_PATCH "0")
 else()
@@ -116,17 +123,12 @@ if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^arm")
 	set(_M_GENERIC 1)
 	set(_M_ARM 1)
 	add_definitions(-marm -march=armv7-a)
-	add_definitions(-D_M_ARM=1)
-	add_definitions(-D_M_GENERIC=1)
 	# Set generic options so you don't have to pass anything to cmake to build ARM
 	set(USE_GLES 1)
 endif()
 
 if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "mips")
 	set(_M_GENERIC 1)
-	set(_M_MIPS 1)
-	add_definitions(-D_M_MIPS=1)
-	add_definitions(-D_M_GENERIC=1)
 endif()
 
 # Set these next two lines to test generic
@@ -255,9 +257,16 @@ if(NOT CMAKE_BUILD_TYPE)
 		"Build type (Release/Debug/RelWithDebInfo/MinSizeRe)" FORCE)
 endif(NOT CMAKE_BUILD_TYPE)
 
+
 if(CMAKE_BUILD_TYPE STREQUAL Debug)
 	add_definitions(-D_DEBUG -ggdb)
 	set(wxWidgets_USE_DEBUG ON CACHE BOOL "Use wxWidgets Debugging")
+
+	option(ENABLE_GPROF "Enable gprof profiling (must be using Debug build)" OFF)
+	if(ENABLE_GPROF)
+		add_definitions(-pg)
+		set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pg")
+	endif()
 endif(CMAKE_BUILD_TYPE STREQUAL Debug)
 
 if(CMAKE_BUILD_TYPE STREQUAL Release AND NOT APPLE)
@@ -268,6 +277,11 @@ if(FASTLOG)
 	add_definitions(-DDEBUGFAST)
 endif()
 
+option(GDBSTUB "Enable gdb stub for remote debugging." OFF)
+if(GDBSTUB)
+	add_definitions(-DUSE_GDBSTUB)
+endif(GDBSTUB)
+
 if(ANDROID)
 	message("Building for Android")
 	add_definitions(-DANDROID)
@@ -316,8 +330,9 @@ add_definitions(-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE)
 # TODO: We should have options for dependencies included in the externals to
 # override autodetection of system libraries and force the usage of the
 # externals.
+include(CheckLib)
+include(CheckCXXSourceRuns)
 if(NOT ANDROID)
-	include(CheckLib)
 
 	include(FindOpenGL)
 	include_directories(${OPENGL_INCLUDE_DIR})
@@ -442,7 +457,6 @@ if(NOT ANDROID)
 		check_libav()
 	endif()
 
-	include(CheckCXXSourceRuns)
 	set(CMAKE_REQUIRED_LIBRARIES portaudio)
 	CHECK_CXX_SOURCE_RUNS(
 		"#include <portaudio.h>
@@ -470,6 +484,7 @@ if(NOT ANDROID)
 		endif()
 	endif()
 endif()
+
 ########################################
 # Setup include directories (and make sure they are preferred over the Externals)
 #
@@ -509,11 +524,16 @@ else()
 	set(LZO lzo2)
 endif()
 
-if(ANDROID)
+if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT ANDROID)
+	check_lib(PNG 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 libpng)
+	set(PNG png)
 endif()
 
 if(OPENAL_FOUND)
@@ -553,6 +573,13 @@ if(NOT ANDROID)
 	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)
@@ -582,6 +609,19 @@ if(USE_UPNP)
 	add_definitions(-DUSE_UPNP)
 endif()
 
+if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT ANDROID)
+	include(FindPolarSSL)
+endif()
+if(POLARSSL_FOUND AND POLARSSL_WORKS)
+	message("Using shared PolarSSL")
+	include_directories(${POLARSSL_INCLUDE_DIR})
+else()
+	message("Using PolarSSL from Externals")
+	set(POLARSSL_LIBRARY polarssl)
+	add_subdirectory(Externals/polarssl/)
+	include_directories(Externals/polarssl/include)
+endif()
+
 if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT ANDROID)
 	check_lib(SOIL SOIL SOIL/SOIL.h QUIET)
 endif()
@@ -612,18 +652,24 @@ if(WIN32)
 	find_library(GLEW glew32s PATHS Externals/GLew)
 	include_directories(Externals/GLew/include)
 else()
-	if(NOT ANDROID)
+	if(NOT USE_GLES3)
 		if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-			check_lib(GLEW GLEW GL/glew.h)
+			include(FindGLEW)
 		endif()
-		if(NOT GLEW_FOUND)
+		if(NOT GLEW_FOUND OR NOT GLEW_HAS_1_9_METHODS)
 			message("Using static GLEW from Externals")
 			add_subdirectory(Externals/GLew)
 			include_directories(Externals/GLew/include)
-		endif(NOT GLEW_FOUND)
+		endif()
 	endif()
 endif()
 
+if (ANDROID)
+	message("Using static iconv from Externals")
+	include_directories(Externals/libiconv-1.14/include)
+	add_subdirectory(Externals/libiconv-1.14)
+endif()
+
 if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT ANDROID)
 	find_library(CL OpenCL)
 	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-weak_framework,OpenCL")
@@ -637,7 +683,7 @@ if(NOT DISABLE_WX AND NOT ANDROID)
 	FIND_PACKAGE(wxWidgets COMPONENTS core aui adv)
 
 	if(wxWidgets_FOUND)
-		EXECUTE_PROCESS(WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} 
+		EXECUTE_PROCESS(WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
 			COMMAND sh "${wxWidgets_CONFIG_EXECUTABLE}"
 			${wxWidgets_CONFIG_OPTIONS} --version
 			OUTPUT_VARIABLE wxWidgets_VERSION
@@ -739,14 +785,8 @@ add_subdirectory(Source)
 # Install shared data files
 #
 if((NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin"))
-	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|FreeBSD|Darwin"))
 	install(FILES Data/license.txt DESTINATION ${datadir})
 endif()
@@ -783,3 +823,4 @@ list(APPEND CPACK_SOURCE_IGNORE_FILES "${CMAKE_BINARY_DIR}")
 # CPack must be included after the CPACK_* variables are set in order for those
 # variables to take effect.
 Include(CPack)
+

CMakeTests/FindGLEW.cmake

@@ -0,0 +1,32 @@
+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()

CMakeTests/FindLibUSB.cmake

@@ -0,0 +1,43 @@
+# - Find libusb-1.0 library
+# This module defines
+#  LIBUSB_INCLUDE_DIR, where to find bluetooth.h
+#  LIBUSB_LIBRARIES, the libraries needed to use libusb-1.0.
+#  LIBUSB_FOUND, If false, do not try to use libusb-1.0.
+#
+# Copyright (c) 2009, Michal Cihar, <michal@cihar.com>
+#
+# vim: expandtab sw=4 ts=4 sts=4:
+
+if(ANDROID)
+       set(LIBUSB_FOUND FALSE CACHE INTERNAL "libusb-1.0 found")
+       message(STATUS "libusb-1.0 not found.")
+elseif (NOT LIBUSB_FOUND)
+    pkg_check_modules (LIBUSB_PKG libusb-1.0)
+
+    find_path(LIBUSB_INCLUDE_DIR NAMES libusb.h
+       PATHS
+       ${LIBUSB_PKG_INCLUDE_DIRS}
+       /usr/include/libusb-1.0
+       /usr/include
+       /usr/local/include/libusb-1.0
+       /usr/local/include
+    )
+
+    find_library(LIBUSB_LIBRARIES NAMES usb-1.0
+       PATHS
+       ${LIBUSB_PKG_LIBRARY_DIRS}
+       /usr/lib
+       /usr/local/lib
+    )
+
+    if(LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES)
+       set(LIBUSB_FOUND TRUE CACHE INTERNAL "libusb-1.0 found")
+       message(STATUS "Found libusb-1.0: ${LIBUSB_INCLUDE_DIR}, ${LIBUSB_LIBRARIES}")
+    else(LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES)
+       set(LIBUSB_FOUND FALSE CACHE INTERNAL "libusb-1.0 found")
+       message(STATUS "libusb-1.0 not found.")
+    endif(LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES)
+
+    mark_as_advanced(LIBUSB_INCLUDE_DIR LIBUSB_LIBRARIES)
+endif ()
+

CMakeTests/FindPolarSSL.cmake

@@ -0,0 +1,59 @@
+# Locate polarssl library
+# This module defines
+#  POLARSSL_FOUND
+#  POLARSSL_LIBRARY
+#  POLARSSL_INCLUDE_DIR
+#  POLARSSL_WORKS, this is true if polarssl is found and contains the methods
+#  needed by dolphin-emu
+
+if(POLARSSL_INCLUDE_DIR AND POLARSSL_LIBRARY)
+	# Already in cache, be silent
+	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 ()
+
+if (POLARSSL_FOUND)
+	if (NOT POLARSSL_FIND_QUIETLY)
+		message (STATUS "Found the polarssl libraries at ${POLARSSL_LIBRARY}")
+		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})
+	check_cxx_source_compiles("
+	#include <polarssl/net.h>
+	#include <polarssl/ssl.h>
+	#include <polarssl/havege.h>
+	int main()
+	{
+	ssl_context ctx;
+	ssl_session session;
+	havege_state hs;
+
+	ssl_init(&ctx);
+	havege_init(&hs);
+	ssl_set_rng(&ctx, havege_random, &hs);
+	ssl_set_session(&ctx, &session);
+
+	ssl_close_notify(&ctx);
+	ssl_session_free(&session);
+	ssl_free(&ctx);
+
+	return 0;
+	}"
+	POLARSSL_WORKS)
+
+else ()
+	message (STATUS "Could not find polarssl")
+endif ()
+
+MARK_AS_ADVANCED(POLARSSL_INCLUDE_DIR POLARSSL_LIBRARY)
+

Data/Sys/GameSettings/D43J01.ini

@@ -13,7 +13,7 @@ EmulationIssues =
 
 [OnFrame]
 # Add memory patches to be applied every frame here.
-+$loophack
+$loophack
 0x806866E4:word:0x60000000
 
 [ActionReplay]

Data/Sys/GameSettings/G3DE6L.ini

@@ -2,6 +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.

Data/Sys/GameSettings/G3DP6L.ini

@@ -1,12 +1,12 @@
-# GXME52 - X-Men3 V6
+# G3DP6L - Carmen Sandiego
 
 [Core]
 # Values set here will override the main dolphin settings.
+TLBHack = 1
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues =
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.

Data/Sys/GameSettings/G3DX6L.ini

@@ -1,7 +1,8 @@
-# GQCS52 - Call of Duty 2: Big Red One
+# G3DX6L - Carmen Sandiego
 
 [Core]
 # Values set here will override the main dolphin settings.
+TLBHack = 1
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.

Data/Sys/GameSettings/G3EE51.ini

@@ -6,7 +6,7 @@
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Black screen. Use an older rev for the game to work like r4727 (r6521 tested)
+EmulationIssues = 
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.

Data/Sys/GameSettings/G3RD52.ini

@@ -19,10 +19,13 @@ EmulationIssues =
 # Add action replay cheats here.
 
 [Video]
-ProjectionHack = 1
-PH_SZNear = 1
-PH_SZFar = 1
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
 PH_ExtraParam = 0
-PH_ZNear = 20
-PH_ZFar = 1.99998
+PH_ZNear = 
+PH_ZFar = 
 
+[Video_Hacks]
+EFBToTextureEnable = False
+EFBCopyEnable = True

Data/Sys/GameSettings/G3RE52.ini

@@ -19,10 +19,13 @@ EmulationIssues =
 # Add action replay cheats here.
 
 [Video]
-ProjectionHack = 1
-PH_SZNear = 1
-PH_SZFar = 1
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
 PH_ExtraParam = 0
-PH_ZNear = 20
-PH_ZFar = 1.99998
+PH_ZNear = 
+PH_ZFar = 
 
+[Video_Hacks]
+EFBToTextureEnable = False
+EFBCopyEnable = True

Data/Sys/GameSettings/G3RF52.ini

@@ -19,10 +19,13 @@ EmulationIssues =
 # Add action replay cheats here.
 
 [Video]
-ProjectionHack = 1
-PH_SZNear = 1
-PH_SZFar = 1
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
 PH_ExtraParam = 0
-PH_ZNear = 20
-PH_ZFar = 1.99998
+PH_ZNear = 
+PH_ZFar = 
 
+[Video_Hacks]
+EFBToTextureEnable = False
+EFBCopyEnable = True

Data/Sys/GameSettings/G3RP52.ini

@@ -19,10 +19,13 @@ EmulationIssues =
 # Add action replay cheats here.
 
 [Video]
-ProjectionHack = 1
-PH_SZNear = 1
-PH_SZFar = 1
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
 PH_ExtraParam = 0
-PH_ZNear = 20
-PH_ZFar = 1.99998
+PH_ZNear = 
+PH_ZFar = 
 
+[Video_Hacks]
+EFBToTextureEnable = False
+EFBCopyEnable = True

Data/Sys/GameSettings/G4QJ01.ini

@@ -1,12 +1,13 @@
-# R3RE8P - Sonic & Sega All-Stars Racing
+# G4QJ01 - Super Mario Strikers
 
 [Core]
 # Values 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 =
+EmulationIssues = 
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.

Data/Sys/GameSettings/G4ZE69.ini

@@ -0,0 +1,20 @@
+# G4ZE69 - The Sims 2 GameCube
+[Core]
+# Values set here will override the main dolphin settings.
+TLBHack = 1
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+[OnFrame]
+[ActionReplay]
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]

Data/Sys/GameSettings/G4ZP69.ini

@@ -0,0 +1,20 @@
+# G4ZP69 - The Sims 2 GameCube
+[Core]
+# Values set here will override the main dolphin settings.
+TLBHack = 1
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+[OnFrame]
+[ActionReplay]
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]

Data/Sys/GameSettings/G5NEAF.ini

@@ -0,0 +1,31 @@
+# G5NEAF - Namco Museum 50th Anniversary
+
+[Core]
+# Values set here will override the main dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+UseXFB = True
+UseRealXFB = False

Data/Sys/GameSettings/G5NP69.ini

@@ -0,0 +1,31 @@
+# G5NP69 - Namco Museum 50th Anniversary
+
+[Core]
+# Values set here will override the main dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+UseXFB = True
+UseRealXFB = False

Data/Sys/GameSettings/G5TE69.ini

@@ -1,12 +1,13 @@
-# RM3P01 - Metroid Prime 3: Corruption
+# G5TE69 - Tiger Woods PGA TOUR 2005
 
 [Core]
 # Values set here will override the main dolphin settings.
+TLBHack = 1
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
 EmulationStateId = 4
-EmulationIssues = minor coloring problems
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -25,12 +26,9 @@ PH_ExtraParam = 0
 PH_ZNear =
 PH_ZFar =
 
+[Video_Hacks]
+EFBCopyEnable = True
+EFBToTextureEnable = False
+
 [Video_Settings]
 SafeTextureCacheColorSamples = 512
-
-[Video_Hacks]
-EFBEmulateFormatChanges = True
-
-[Speedhacks]
-0x804e8b20=600
-

Data/Sys/GameSettings/G5TP69.ini

@@ -0,0 +1,34 @@
+# G5TP69 - Tiger Woods PGA TOUR 2005
+
+[Core]
+# Values set here will override the main dolphin settings.
+TLBHack = 1
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Hacks]
+EFBCopyEnable = True
+EFBToTextureEnable = False
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512

Data/Sys/GameSettings/G6WE69.ini

@@ -0,0 +1,31 @@
+# G6WE69 - Tiger Woods PGA TOUR 06
+
+[Core]
+# Values set here will override the main dolphin settings.
+TLBHack = 1
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Hacks]
+EFBCopyEnable = True
+EFBToTextureEnable = False

Data/Sys/GameSettings/G6WP69.ini

@@ -0,0 +1,31 @@
+# G6WP69 - Tiger Woods PGA TOUR 06
+
+[Core]
+# Values set here will override the main dolphin settings.
+TLBHack = 1
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Hacks]
+EFBCopyEnable = True
+EFBToTextureEnable = False

Data/Sys/GameSettings/G8WE01.ini

@@ -0,0 +1,27 @@
+# G8WE01 - Battalion Wars
+
+[Core]
+# Values set here will override the main dolphin settings.
+SkipIdle = False
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Idle skipping slows down the game.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =

Data/Sys/GameSettings/G8WP01.ini

@@ -0,0 +1,32 @@
+# G8WP01 - Battalion Wars
+
+[Core]
+# Values set here will override the main dolphin settings.
+SkipIdle = False
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Idle skipping slows down the game.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+$Invincible
+0752E977 08000000
+04338650 00000001
+$Infinite Time
+0752E978 08000000
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =