Merge pull request #2 from dolphin-emu/master

CMakeLists.txt

@@ -709,10 +709,12 @@ else()
   include_directories(Externals/SOIL)
 endif()
 
-find_library(ICONV_LIBRARIES NAMES iconv libiconv libiconv-2 c)
-find_path(ICONV_INCLUDE_DIR NAMES iconv.h)
+if (NOT ANDROID)
+	find_library(ICONV_LIBRARIES NAMES iconv libiconv libiconv-2 c)
+	find_path(ICONV_INCLUDE_DIR NAMES iconv.h)
+endif()
 
-if (ICONV_LIBRARIES AND ICONV_INCLUDE_DIR)
+if (NOT ANDROID AND ICONV_LIBRARIES AND ICONV_INCLUDE_DIR)
   mark_as_advanced(ICONV_INCLUDE_DIR ICONV_LIBRARIES)
 else()
   message(STATUS "Using static iconv from Externals")

Data/Sys/GameSettings/DLS.ini

@@ -21,8 +21,7 @@ EmulationIssues =
 [Video]
 
 [Video_Settings]
-UseXFB = True
-UseRealXFB = False
 
 [Video_Hacks]
 EFBToTextureEnable = False
+ImmediateXFBEnable = False

Data/Sys/GameSettings/E5Z.ini

@@ -19,5 +19,6 @@ EmulationStateId = 4
 
 [Video_Settings]
 SafeTextureCacheColorSamples = 0
-UseXFB = True
-UseRealXFB = True
+
+[Video_Hacks]
+ImmediateXFBEnable = False

Data/Sys/GameSettings/E62.ini

@@ -19,5 +19,6 @@ EmulationStateId = 4
 
 [Video_Settings]
 SafeTextureCacheColorSamples = 0
-UseXFB = True
-UseRealXFB = True
+
+[Video_Hacks]
+ImmediateXFBEnable = False

Data/Sys/GameSettings/E63.ini

@@ -19,5 +19,6 @@ EmulationStateId = 4
 
 [Video_Settings]
 SafeTextureCacheColorSamples = 0
-UseXFB = True
-UseRealXFB = True
+
+[Video_Hacks]
+ImmediateXFBEnable = False

Data/Sys/GameSettings/E6V.ini

@@ -19,5 +19,6 @@ EmulationStateId = 4
 
 [Video_Settings]
 SafeTextureCacheColorSamples = 0
-UseXFB = True
-UseRealXFB = True
+
+[Video_Hacks]
+ImmediateXFBEnable = False

Data/Sys/GameSettings/E6W.ini

@@ -19,5 +19,6 @@ EmulationStateId = 4
 
 [Video_Settings]
 SafeTextureCacheColorSamples = 0
-UseXFB = True
-UseRealXFB = True
+
+[Video_Hacks]
+ImmediateXFBEnable = False

Data/Sys/GameSettings/E6X.ini

@@ -19,5 +19,6 @@ EmulationStateId = 4
 
 [Video_Settings]
 SafeTextureCacheColorSamples = 0
-UseXFB = True
-UseRealXFB = True
+
+[Video_Hacks]
+ImmediateXFBEnable = False

Data/Sys/GameSettings/G2V.ini

@@ -6,7 +6,7 @@
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Needs xfb real for videos to show up.
+EmulationIssues =
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -18,6 +18,7 @@ EmulationIssues = Needs xfb real for videos to show up.
 # Add action replay cheats here.
 
 [Video_Settings]
-UseXFB = True
-UseRealXFB = True
+
+[Video_Hacks]
+ImmediateXFBEnable = False
 

Data/Sys/GameSettings/G4C.ini

@@ -6,7 +6,7 @@
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Needs real xfb for the videos to display.
+EmulationIssues =
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -18,5 +18,6 @@ EmulationIssues = Needs real xfb for the videos to display.
 # Add action replay cheats here.
 
 [Video_Settings]
-UseXFB = True
-UseRealXFB = True
+
+[Video_Hacks]
+ImmediateXFBEnable = False

Data/Sys/GameSettings/G5N.ini

@@ -19,5 +19,6 @@ EmulationIssues =
 
 [Video_Settings]
 SafeTextureCacheColorSamples = 0
-UseXFB = True
-UseRealXFB = False
+
+[Video_Hacks]
+ImmediateXFBEnable = False

Data/Sys/GameSettings/G6Q.ini

@@ -6,7 +6,7 @@
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 3
-EmulationIssues = Needs real xfb for the videos to display.
+EmulationIssues =
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -19,5 +19,6 @@ EmulationIssues = Needs real xfb for the videos to display.
 
 [Video_Settings]
 SafeTextureCacheColorSamples = 0
-UseXFB = True
-UseRealXFB = True
+
+[Video_Hacks]
+ImmediateXFBEnable = False

Data/Sys/GameSettings/G8M.ini

@@ -20,6 +20,7 @@ EmulationIssues = Needs Efb to Ram for BBox (proper graphics).
 [Video_Hacks]
 EFBToTextureEnable = False
 BBoxEnable = True
+ImmediateXFBEnable = False
 
 [Video_Stereoscopy]
 StereoConvergence = 545

Data/Sys/GameSettings/G9S.ini

@@ -19,6 +19,6 @@ EmulationIssues = Use directx11 backend with efb scale set at 1x to deal with bl
 
 [Video_Settings]
 SafeTextureCacheColorSamples = 0
-EFBScale = 2
+InternalResolution = 1
 MSAA = 0
 MaxAnisotropy = 0

Data/Sys/GameSettings/GAP.ini

@@ -6,7 +6,7 @@
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Needs real xfb for the videos to show up.
+EmulationIssues = 
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -18,5 +18,6 @@ EmulationIssues = Needs real xfb for the videos to show up.
 # Add action replay cheats here.
 
 [Video_Settings]
-UseXFB = True
-UseRealXFB = True
+
+[Video_Hacks]
+ImmediateXFBEnable = False

Data/Sys/GameSettings/GAU.ini

@@ -18,6 +18,7 @@ EmulationIssues =
 # Add action replay cheats here.
 
 [Video_Settings]
-UseXFB = True
-UseRealXFB = False
+
+[Video_Hacks]
+ImmediateXFBEnable = False
 

Data/Sys/GameSettings/GAY.ini

@@ -19,5 +19,6 @@ EmulationIssues =
 
 [Video_Settings]
 SafeTextureCacheColorSamples = 0
-UseXFB = True
-UseRealXFB = True
+
+[Video_Hacks]
+ImmediateXFBEnable = False

Data/Sys/GameSettings/GBH.ini

@@ -6,7 +6,7 @@
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Needs Real xfb for the videos to display.
+EmulationIssues =
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -18,6 +18,7 @@ EmulationIssues = Needs Real xfb for the videos to display.
 # Add action replay cheats here.
 
 [Video_Settings]
-UseXFB = True
-UseRealXFB = True
+
+[Video_Hacks]
+ImmediateXFBEnable = False
 

Data/Sys/GameSettings/GBL.ini

@@ -6,7 +6,7 @@
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Needs real xfb for videos to display.
+EmulationIssues = 
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -18,6 +18,7 @@ EmulationIssues = Needs real xfb for videos to display.
 # Add action replay cheats here.
 
 [Video_Settings]
-UseXFB = True
-UseRealXFB = True
+
+[Video_Hacks]
+ImmediateXFBEnable = False
 

Data/Sys/GameSettings/GBM.ini

@@ -6,7 +6,7 @@
 [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.
+EmulationIssues = 
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -18,5 +18,6 @@ EmulationIssues = Needs real xfb for videos to show up.
 # Add action replay cheats here.
 
 [Video_Settings]
-UseXFB = True
-UseRealXFB = True
+
+[Video_Hacks]
+ImmediateXFBEnable = False

Data/Sys/GameSettings/GBV.ini

@@ -6,7 +6,7 @@
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 3
-EmulationIssues = Needs Real xfb for videos to display.
+EmulationIssues = 
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -18,5 +18,6 @@ EmulationIssues = Needs Real xfb for videos to display.
 # Add action replay cheats here.
 
 [Video_Settings]
-UseXFB = True
-UseRealXFB = True
+
+[Video_Hacks]
+ImmediateXFBEnable = False

Data/Sys/GameSettings/GBW.ini

@@ -6,7 +6,7 @@
 [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.
+EmulationIssues = 
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -18,6 +18,7 @@ EmulationIssues = Needs real xfb for videos to show up.
 # Add action replay cheats here.
 
 [Video_Settings]
-UseXFB = True
-UseRealXFB = True
+
+[Video_Hacks]
+ImmediateXFBEnable = False
 

Data/Sys/GameSettings/GC2.ini

@@ -6,7 +6,7 @@
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Needs real Xfb for the videos to display.
+EmulationIssues =
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -18,5 +18,6 @@ EmulationIssues = Needs real Xfb for the videos to display.
 # Add action replay cheats here.
 
 [Video_Settings]
-UseXFB = True
-UseRealXFB = True
+
+[Video_Hacks]
+ImmediateXFBEnable = False

Data/Sys/GameSettings/GCE.ini

@@ -2,9 +2,9 @@
 [Core]
 [EmuState]
 EmulationStateId = 4
-EmulationIssues = Needs real xfb for the videos to display.
+EmulationIssues =
 [OnFrame]
 [ActionReplay]
 [Video_Settings]
-UseXFB = True
-UseRealXFB = True
+[Video_Hacks]
+ImmediateXFBEnable = False

Data/Sys/GameSettings/GCN.ini

@@ -17,6 +17,7 @@ EmulationStateId = 4
 # Add action replay cheats here.
 
 [Video_Settings]
-UseXFB = True
-UseRealXFB = True
+
+[Video_Hacks]
+ImmediateXFBEnable = False
 

Data/Sys/GameSettings/GCP.ini

@@ -6,7 +6,7 @@
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Needs real xfb for videos to appear.
+EmulationIssues =
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -18,8 +18,6 @@ EmulationIssues = Needs real xfb for videos to appear.
 # Add action replay cheats here.
 
 [Video_Settings]
-UseXFB = True
-UseRealXFB = True
 
 [Video_Hacks]
-
+ImmediateXFBEnable = False

Data/Sys/GameSettings/GDD.ini

@@ -6,7 +6,7 @@
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Needs real xfb for the videos to display.
+EmulationIssues =
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -18,5 +18,6 @@ EmulationIssues = Needs real xfb for the videos to display.
 # Add action replay cheats here.
 
 [Video_Settings]
-UseXFB = True
-UseRealXFB = True
+
+[Video_Hacks]
+ImmediateXFBEnable = False

Data/Sys/GameSettings/GDG.ini

@@ -6,7 +6,7 @@
 [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.
+EmulationIssues = 
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -18,6 +18,7 @@ EmulationIssues = Needs Real Xfb for videos to show up.
 # Add action replay cheats here.
 
 [Video_Settings]
-UseXFB = True
-UseRealXFB = True
+
+[Video_Hacks]
+ImmediateXFBEnable = False