Merge branch 'master' into wxw3-update

Conflicts:
	Source/Core/DolphinWX/Src/LogWindow.cpp

CMakeLists.txt

@@ -2,6 +2,17 @@
 # General setup
 #
 cmake_minimum_required(VERSION 2.6)
+
+# 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++")
+	endif()
+endif()
 project(dolphin-emu)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/CMakeTests)
 set(DOLPHIN_IS_STABLE FALSE)
@@ -135,7 +146,11 @@ if (APPLE)
 	# features can be used, not the minimum required version to run.
 	set(OSX_MIN_VERSION "10.5.4")
 	set(TARGET_FLAGS "${TARGET_FLAGS} -mmacosx-version-min=${OSX_MIN_VERSION}")
-	set(TARGET_FLAGS "${TARGET_FLAGS} -isysroot /Developer/SDKs/MacOSX10.6.sdk")
+	set(TARGET_SYSROOT "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk")
+	if (NOT EXISTS "${TARGET_SYSROOT}/")
+		set(TARGET_SYSROOT "/Developer/SDKs/MacOSX10.6.sdk")
+	endif()
+	set(TARGET_FLAGS "${TARGET_FLAGS} -isysroot ${TARGET_SYSROOT}")
 	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-syslibroot,/Developer/SDKs/MacOSX10.6.sdk")
 	# Do not warn about frameworks that are not available on all architectures.
 	# This avoids a warning when linking with QuickTime.

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
-EmulationIssues = Sound issues need LLE plugin and videos are messed up. Slow due to MMU(r6932)
+EmulationStateId = 4
+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/G6TP5G.ini

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

Data/User/GameConfig/GCZE69.ini

@@ -1,17 +1,20 @@
 # 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]
-

Data/User/GameConfig/GCZP69.ini

@@ -1,15 +1,20 @@
 # 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/GDGE7H.ini

@@ -1,9 +1,9 @@
 # GDGE7H - Dragon's Lair 3D
 [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
-EmulationIssues = Needs MMU (very slow due to that).
+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]

Data/User/GameConfig/GDGP78.ini

@@ -1,9 +1,9 @@
 # GDGP78 - Dragon's Lair 3D
 [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
-EmulationIssues = Needs MMU (very slow due to that).
+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]

Data/User/GameConfig/GEND69.ini

@@ -2,8 +2,8 @@
 [Core] Values 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
+EmulationIssues = Needs LLE audio for proper sound. Graphic glitches (depth issues). Fixed in zcomploc support Dolphin branch.
+EmulationStateId = 3
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]

Data/User/GameConfig/GENE69.ini

@@ -2,8 +2,8 @@
 [Core] Values 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
+EmulationIssues = Needs LLE audio for proper sound. Graphic glitches (depth issues). Fixed in zcomploc support Dolphin branch.
+EmulationStateId = 3
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]

Data/User/GameConfig/GENP69.ini

@@ -2,8 +2,8 @@
 [Core] Values 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
+EmulationIssues = Needs LLE audio for proper sound. Graphic glitches (depth issues). Fixed in zcomploc support Dolphin branch.
+EmulationStateId = 3
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]

Data/User/GameConfig/GENS69.ini

@@ -2,8 +2,8 @@
 [Core] Values 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
+EmulationIssues = Needs LLE audio for proper sound. Graphic glitches (depth issues). Fixed in zcomploc support Dolphin branch.
+EmulationStateId = 3
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]

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)
-EmulationStateId = 3
+EmulationIssues = Sound issues need LLE audio to be fixed and the videos are messed up.
+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
-EmulationIssues = Sound issues need LLE plugin and videos are messed up. Slow due to MMU(r6932)
+EmulationStateId = 4
+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/GFAD69.ini

@@ -1,9 +1,9 @@
 # GFAD69 - FIFA 2003
 [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
-EmulationIssues = Sound issues need LLE plugin and videos are messed up. Slow due to MMU.
+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]

Data/User/GameConfig/GFAE69.ini

@@ -1,9 +1,9 @@
 # GFAE69 - FIFA 2003
 [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
-EmulationIssues = Sound issues need LLE plugin and videos are messed up. Slow due to MMU.
+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]

Data/User/GameConfig/GFAP69.ini

@@ -1,9 +1,9 @@
 # GFAP69 - FIFA 2003
 [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
-EmulationIssues = Sound issues need LLE plugin and videos are messed up. Slow due to MMU.
+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]