Merge in upstream dolphin/master into libretro

.editorconfig

@@ -11,7 +11,8 @@ insert_final_newline = true
 max_line_length = 100
 
 [{CMakeLists.txt,*.cmake}]
-indent_style = tab
+indent_style = space
+insert_final_newline = true
 
 [.editorconfig]
 insert_final_newline = true

BuildMacOSUniversalBinary.py

@@ -295,6 +295,8 @@ def build(config):
                 "-DENABLE_AUTOUPDATE="
                 + python_to_cmake_bool(config["autoupdate"]),
                 '-DDISTRIBUTOR=' + config['distributor'],
+                # Distributable bundles need to be postprocessed to embed dependencies
+                "-DPOSTPROCESS_BUNDLE=ON",
                 # Always use libraries from Externals to prevent any libraries
                 # installed by Homebrew from leaking in to the app
                 "-DUSE_SYSTEM_LIBS=OFF",

CMake/CCache.cmake

@@ -1,17 +1,13 @@
 find_program(CCACHE_BIN NAMES ccache sccache)
 if(CCACHE_BIN)
-    # Official ccache recommendation is to set CMAKE_C(XX)_COMPILER_LAUNCHER
-    if (NOT CMAKE_C_COMPILER_LAUNCHER MATCHES "ccache")
-        list(INSERT CMAKE_C_COMPILER_LAUNCHER 0 "${CCACHE_BIN}")
+  set(_CCACHE_SUPPORTED_LAUCHERS C CXX OBJC OBJCXX)
+  foreach(LAUNCHER ${_CCACHE_SUPPORTED_LAUCHERS})
+    if (NOT CMAKE_${LAUNCHER}_COMPILER_LAUNCHER MATCHES "ccache")
+      list(INSERT CMAKE_${LAUNCHER}_COMPILER_LAUNCHER 0 ${CCACHE_BIN})
     endif()
-
-    if (NOT CMAKE_CXX_COMPILER_LAUNCHER MATCHES "ccache")
-        list(INSERT CMAKE_CXX_COMPILER_LAUNCHER 0 "${CCACHE_BIN}")
-    endif()
-
     # ccache uses -I when compiling without preprocessor, which makes clang complain.
-    if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-        set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Qunused-arguments -fcolor-diagnostics")
-        set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Qunused-arguments -fcolor-diagnostics")
+    if("${CMAKE_${LAUNCHER}_COMPILER_ID}" MATCHES "Clang")
+      set(CMAKE_${LAUNCHER}_FLAGS "${CMAKE_${LAUNCHER}_FLAGS} -Qunused-arguments -fcolor-diagnostics")
     endif()
+  endforeach()
 endif()

CMake/CheckLib.cmake

@@ -1,58 +1,58 @@
 find_package(PkgConfig)
 
 macro(_internal_message msg)
-	if(NOT ${_is_quiet})
-		message(STATUS "${msg}")
-	endif()
+  if(NOT ${_is_quiet})
+    message(STATUS "${msg}")
+  endif()
 endmacro()
 
 macro(check_lib var pc lib)
-	set(_is_required 0)
-	set(_is_quiet 0)
-	set(_arg_list ${ARGN})
-	foreach(_arg ${ARGN})
-		if(_arg STREQUAL "REQUIRED")
-			list(REMOVE_ITEM _arg_list "REQUIRED")
-			set(_is_required 1)
-		endif()
-		if(_arg STREQUAL "QUIET")
-			list(REMOVE_ITEM _arg_list "QUIET")
-			set(_is_quiet 1)
-		endif()
-	endforeach()
+  set(_is_required 0)
+  set(_is_quiet 0)
+  set(_arg_list ${ARGN})
+  foreach(_arg ${ARGN})
+    if(_arg STREQUAL "REQUIRED")
+      list(REMOVE_ITEM _arg_list "REQUIRED")
+      set(_is_required 1)
+    endif()
+    if(_arg STREQUAL "QUIET")
+      list(REMOVE_ITEM _arg_list "QUIET")
+      set(_is_quiet 1)
+    endif()
+  endforeach()
 
-	if(PKG_CONFIG_FOUND AND NOT ${var}_FOUND)
-		pkg_search_module(${var} QUIET ${pc})
-	endif()
+  if(PKG_CONFIG_FOUND AND NOT ${var}_FOUND)
+    pkg_search_module(${var} QUIET ${pc})
+  endif()
 
-	if(${var}_FOUND)
-		if(${var}_INCLUDE_DIRS)
-			include_directories(${${var}_INCLUDE_DIRS})
-		endif()
-		# Make sure include directories for headers found using find_path below
-		# are re-added when reconfiguring
-		if(${var}_INCLUDE)
-			include_directories(${${var}_INCLUDE})
-		endif()
-		_internal_message("${lib} found")
-	else()
-		find_library(${var} ${lib})
-		if(_arg_list)
-			find_path(${var}_INCLUDE ${_arg_list})
-		else()
-			set(${var}_INCLUDE FALSE)
-		endif()
-		if(${var} AND ${var}_INCLUDE)
-			include_directories(${${var}_INCLUDE})
-			_internal_message("${lib} found")
-			set(${var}_FOUND 1 CACHE INTERNAL "")
-		else()
-			if(_is_required)
-				message(FATAL_ERROR "${lib} is required but not found")
-			else()
-				_internal_message("${lib} not found")
-			endif()
-		endif()
-	endif()
+  if(${var}_FOUND)
+    if(${var}_INCLUDE_DIRS)
+      include_directories(${${var}_INCLUDE_DIRS})
+    endif()
+    # Make sure include directories for headers found using find_path below
+    # are re-added when reconfiguring
+    if(${var}_INCLUDE)
+      include_directories(${${var}_INCLUDE})
+    endif()
+    _internal_message("${lib} found")
+  else()
+    find_library(${var} ${lib})
+    if(_arg_list)
+      find_path(${var}_INCLUDE ${_arg_list})
+    else()
+      set(${var}_INCLUDE FALSE)
+    endif()
+    if(${var} AND ${var}_INCLUDE)
+      include_directories(${${var}_INCLUDE})
+      _internal_message("${lib} found")
+      set(${var}_FOUND 1 CACHE INTERNAL "")
+    else()
+      if(_is_required)
+        message(FATAL_ERROR "${lib} is required but not found")
+      else()
+        _internal_message("${lib} not found")
+      endif()
+    endif()
+  endif()
 endmacro()
 

CMake/DolphinPostprocessBundle.cmake

@@ -10,15 +10,15 @@
 # module as a post-build step.
 
 if(CMAKE_GENERATOR)
-	# Being called as include(DolphinPostprocessBundle), so define a helper function.
-	set(_DOLPHIN_POSTPROCESS_BUNDLE_MODULE_LOCATION "${CMAKE_CURRENT_LIST_FILE}")
-	function(dolphin_postprocess_bundle target)
-		add_custom_command(TARGET ${target} POST_BUILD
-			COMMAND ${CMAKE_COMMAND} "-D" "DOLPHIN_BUNDLE_PATH=$<TARGET_BUNDLE_DIR:${target}>"
-				-P "${_DOLPHIN_POSTPROCESS_BUNDLE_MODULE_LOCATION}"
-		)
-	endfunction()
-	return()
+  # Being called as include(DolphinPostprocessBundle), so define a helper function.
+  set(_DOLPHIN_POSTPROCESS_BUNDLE_MODULE_LOCATION "${CMAKE_CURRENT_LIST_FILE}")
+  function(dolphin_postprocess_bundle target)
+    add_custom_command(TARGET ${target} POST_BUILD
+      COMMAND ${CMAKE_COMMAND} "-D" "DOLPHIN_BUNDLE_PATH=$<TARGET_BUNDLE_DIR:${target}>"
+        -P "${_DOLPHIN_POSTPROCESS_BUNDLE_MODULE_LOCATION}"
+    )
+  endfunction()
+  return()
 endif()
 
 message(STATUS "Fixing up application bundle: ${DOLPHIN_BUNDLE_PATH}")
@@ -35,9 +35,9 @@ set(extra_dirs "/usr/local/lib" "/lib" "/usr/lib")
 
 # BundleUtilities is overly verbose, so disable most of its messages
 function(message)
-	if(NOT ARGV MATCHES "^STATUS;")
-		_message(${ARGV})
-	endif()
+  if(NOT ARGV MATCHES "^STATUS;")
+    _message(${ARGV})
+  endif()
 endfunction()
 
 include(BundleUtilities)

CMake/FindCUBEB.cmake

@@ -4,7 +4,7 @@ mark_as_advanced(CUBEB_INCLUDE_DIR CUBEB_LIBRARY)
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(CUBEB DEFAULT_MSG
-	CUBEB_INCLUDE_DIR CUBEB_LIBRARY)
+  CUBEB_INCLUDE_DIR CUBEB_LIBRARY)
 
 if(CUBEB_FOUND AND NOT TARGET cubeb::cubeb)
   add_library(cubeb::cubeb UNKNOWN IMPORTED)

CMake/FindEGL.cmake

@@ -36,16 +36,16 @@ find_package(PkgConfig)
 pkg_check_modules(PC_EGL egl)
 
 if (PC_EGL_FOUND)
-    set(EGL_DEFINITIONS ${PC_EGL_CFLAGS_OTHER})
+  set(EGL_DEFINITIONS ${PC_EGL_CFLAGS_OTHER})
 endif ()
 
 find_path(EGL_INCLUDE_DIRS NAMES EGL/egl.h
-    HINTS ${PC_EGL_INCLUDEDIR} ${PC_EGL_INCLUDE_DIRS}
+  HINTS ${PC_EGL_INCLUDEDIR} ${PC_EGL_INCLUDE_DIRS}
 )
 
 set(EGL_NAMES ${EGL_NAMES} egl EGL)
 find_library(EGL_LIBRARIES NAMES ${EGL_NAMES}
-    HINTS ${PC_EGL_LIBDIR} ${PC_EGL_LIBRARY_DIRS}
+  HINTS ${PC_EGL_LIBDIR} ${PC_EGL_LIBRARY_DIRS}
 )
 
 include(FindPackageHandleStandardArgs)

CMake/FindHIDAPI.cmake

@@ -7,11 +7,11 @@ include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(HIDAPI DEFAULT_MSG HIDAPI_LIBRARY HIDAPI_INCLUDE_DIR)
 
 if(HIDAPI_FOUND AND NOT TARGET Hidapi::Hidapi)
-    add_library(Hidapi::Hidapi UNKNOWN IMPORTED)
-    set_target_properties(Hidapi::Hidapi PROPERTIES
-      IMPORTED_LOCATION ${HIDAPI_LIBRARIES}
-      INTERFACE_INCLUDE_DIRECTORIES ${HIDAPI_INCLUDE_DIRS}
-    )
+  add_library(Hidapi::Hidapi UNKNOWN IMPORTED)
+  set_target_properties(Hidapi::Hidapi PROPERTIES
+    IMPORTED_LOCATION ${HIDAPI_LIBRARIES}
+    INTERFACE_INCLUDE_DIRECTORIES ${HIDAPI_INCLUDE_DIRS}
+  )
 endif()
 
 mark_as_advanced(HIDAPI_INCLUDE_DIR HIDAPI_LIBRARY)

CMake/FindLIBEVDEV.cmake

@@ -8,19 +8,19 @@ find_package(PkgConfig)
 pkg_check_modules(PC_LIBEVDEV QUIET libevdev)
 
 FIND_PATH(
-    LIBEVDEV_INCLUDE_DIR libevdev/libevdev.h
-    HINTS ${PC_LIBEVDEV_INCLUDEDIR} ${PC_LIBEVDEV_INCLUDE_DIRS}
-    /usr/include
-    /usr/local/include
-    ${LIBEVDEV_PATH_INCLUDES}
+  LIBEVDEV_INCLUDE_DIR libevdev/libevdev.h
+  HINTS ${PC_LIBEVDEV_INCLUDEDIR} ${PC_LIBEVDEV_INCLUDE_DIRS}
+  /usr/include
+  /usr/local/include
+  ${LIBEVDEV_PATH_INCLUDES}
 )
 
 FIND_LIBRARY(
-    LIBEVDEV_LIBRARY
-    NAMES evdev libevdev
-    HINTS ${PC_LIBEVDEV_LIBDIR} ${PC_LIBEVDEV_LIBRARY_DIRS}
-    PATHS ${ADDITIONAL_LIBRARY_PATHS}
-        ${LIBEVDEV_PATH_LIB}
+  LIBEVDEV_LIBRARY
+  NAMES evdev libevdev
+  HINTS ${PC_LIBEVDEV_LIBDIR} ${PC_LIBEVDEV_LIBRARY_DIRS}
+  PATHS ${ADDITIONAL_LIBRARY_PATHS}
+    ${LIBEVDEV_PATH_LIB}
 )
 
 set(LIBEVDEV_LIBRARIES ${LIBEVDEV_LIBRARY} )

CMake/FindLIBMGBA.cmake

@@ -4,7 +4,7 @@ mark_as_advanced(LIBMGBA_INCLUDE_DIR LIBMGBA_LIBRARY)
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(LIBMGBA DEFAULT_MSG
-	LIBMGBA_INCLUDE_DIR LIBMGBA_LIBRARY)
+  LIBMGBA_INCLUDE_DIR LIBMGBA_LIBRARY)
 
 if(LIBMGBA_FOUND AND NOT mGBA::mgba)
   add_library(mGBA::mgba UNKNOWN IMPORTED)

CMake/FindLIBUDEV.cmake

@@ -5,17 +5,17 @@
 #  LIBUDEV_LIBRARIES - The libraries needed to use LIBUDEV
 
 FIND_PATH(
-    LIBUDEV_INCLUDE_DIR libudev.h
-    /usr/include
-    /usr/local/include
-    ${LIBUDEV_PATH_INCLUDES}
+  LIBUDEV_INCLUDE_DIR libudev.h
+  /usr/include
+  /usr/local/include
+  ${LIBUDEV_PATH_INCLUDES}
 )
 
 FIND_LIBRARY(
-    LIBUDEV_LIBRARY
-    NAMES udev libudev
-    PATHS ${ADDITIONAL_LIBRARY_PATHS}
-        ${LIBUDEV_PATH_LIB}
+  LIBUDEV_LIBRARY
+  NAMES udev libudev
+  PATHS ${ADDITIONAL_LIBRARY_PATHS}
+    ${LIBUDEV_PATH_LIB}
 )
 
 set(LIBUDEV_LIBRARIES ${LIBUDEV_LIBRARY} )

CMake/FindLZO.cmake

@@ -4,7 +4,7 @@ mark_as_advanced(LZO_INCLUDE_DIR LZO_LIBRARY)
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(LZO DEFAULT_MSG
-	LZO_INCLUDE_DIR LZO_LIBRARY)
+  LZO_INCLUDE_DIR LZO_LIBRARY)
 
 if(LZO_FOUND AND NOT TARGET LZO::LZO)
   add_library(LZO::LZO UNKNOWN IMPORTED)

CMake/FindLibUSB.cmake

@@ -9,42 +9,42 @@
 # 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.")
+  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)
+  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_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 usb
-       PATHS
-       ${LIBUSB_PKG_LIBRARY_DIRS}
-       /usr/lib
-       /usr/local/lib
-    )
+  find_library(LIBUSB_LIBRARIES NAMES usb-1.0 usb
+    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)
+  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)
+  mark_as_advanced(LIBUSB_INCLUDE_DIR LIBUSB_LIBRARIES)
 endif ()
 if(LIBUSB_FOUND AND NOT TARGET LibUSB::LibUSB)
-    add_library(LibUSB::LibUSB UNKNOWN IMPORTED)
-    set_target_properties(LibUSB::LibUSB PROPERTIES
-        IMPORTED_LOCATION "${LIBUSB_LIBRARIES}"
-        INTERFACE_INCLUDE_DIRECTORIES "${LIBUSB_INCLUDE_DIR}"
-    )
+  add_library(LibUSB::LibUSB UNKNOWN IMPORTED)
+  set_target_properties(LibUSB::LibUSB PROPERTIES
+    IMPORTED_LOCATION "${LIBUSB_LIBRARIES}"
+    INTERFACE_INCLUDE_DIRECTORIES "${LIBUSB_INCLUDE_DIR}"
+  )
 endif()
 

CMake/FindMBEDTLS.cmake

@@ -8,52 +8,52 @@ set(MBEDTLS_INCLUDE_DIRS ${MBEDTLS_INCLUDE_DIR})
 set(MBEDTLS_LIBRARIES ${MBEDTLS_LIBRARY} ${MBEDX509_LIBRARY} ${MBEDCRYPTO_LIBRARY})
 
 if(NOT MBEDTLS_INCLUDE_DIR STREQUAL "MBEDTLS_INCLUDE_DIR-NOTFOUND")
-	if(EXISTS ${MBEDTLS_INCLUDE_DIR}/mbedtls/build_info.h)
-	    file(STRINGS ${MBEDTLS_INCLUDE_DIR}/mbedtls/build_info.h MBEDTLS_VERSION_STR REGEX "^#define[ \t]+MBEDTLS_VERSION_STRING[\t ].*")
-	else()
-	    file(STRINGS ${MBEDTLS_INCLUDE_DIR}/mbedtls/version.h MBEDTLS_VERSION_STR REGEX "^#define[ \t]+MBEDTLS_VERSION_STRING[\t ].*")
-	endif()
-	string(REGEX REPLACE "^#define[\t ]+MBEDTLS_VERSION_STRING[\t ]+\"([.0-9]+)\".*" "\\1" MBEDTLS_VERSION ${MBEDTLS_VERSION_STR})
+  if(EXISTS ${MBEDTLS_INCLUDE_DIR}/mbedtls/build_info.h)
+    file(STRINGS ${MBEDTLS_INCLUDE_DIR}/mbedtls/build_info.h MBEDTLS_VERSION_STR REGEX "^#define[ \t]+MBEDTLS_VERSION_STRING[\t ].*")
+  else()
+    file(STRINGS ${MBEDTLS_INCLUDE_DIR}/mbedtls/version.h MBEDTLS_VERSION_STR REGEX "^#define[ \t]+MBEDTLS_VERSION_STRING[\t ].*")
+  endif()
+  string(REGEX REPLACE "^#define[\t ]+MBEDTLS_VERSION_STRING[\t ]+\"([.0-9]+)\".*" "\\1" MBEDTLS_VERSION ${MBEDTLS_VERSION_STR})
 endif()
 
 if(NOT MBEDTLS_INCLUDE_DIR STREQUAL "MBEDTLS_INCLUDE_DIR-NOTFOUND" AND MBEDTLS_VERSION VERSION_GREATER_EQUAL 3)
-	# Once CMake 3.19 is required, we can enable HANDLE_VERSION_RANGE and use that
-	if(MBEDTLS_FIND_REQUIRED)
-		set(type FATAL_ERROR)
-	else()
-		set(type STATUS)
-	endif()
-	if(MBEDTLS_FIND_REQUIRED OR NOT MBEDTLS_FIND_QUIETLY)
-		message(${type} "Could NOT find MBEDTLS: Found unsuitable version \"${MBEDTLS_VERSION}\", but a 2.x version is required (found ${MBEDTLS_INCLUDE_DIR})")
-	endif()
-	set(MBEDTLS_FOUND FALSE)
+  # Once CMake 3.19 is required, we can enable HANDLE_VERSION_RANGE and use that
+  if(MBEDTLS_FIND_REQUIRED)
+    set(type FATAL_ERROR)
+  else()
+    set(type STATUS)
+  endif()
+  if(MBEDTLS_FIND_REQUIRED OR NOT MBEDTLS_FIND_QUIETLY)
+    message(${type} "Could NOT find MBEDTLS: Found unsuitable version \"${MBEDTLS_VERSION}\", but a 2.x version is required (found ${MBEDTLS_INCLUDE_DIR})")
+  endif()
+  set(MBEDTLS_FOUND FALSE)
 else()
-	include(FindPackageHandleStandardArgs)
-	find_package_handle_standard_args(MBEDTLS
-		REQUIRED_VARS MBEDTLS_INCLUDE_DIR MBEDTLS_LIBRARY MBEDX509_LIBRARY MBEDCRYPTO_LIBRARY
-		VERSION_VAR MBEDTLS_VERSION)
+  include(FindPackageHandleStandardArgs)
+  find_package_handle_standard_args(MBEDTLS
+    REQUIRED_VARS MBEDTLS_INCLUDE_DIR MBEDTLS_LIBRARY MBEDX509_LIBRARY MBEDCRYPTO_LIBRARY
+    VERSION_VAR MBEDTLS_VERSION)
 endif()
 
 mark_as_advanced(MBEDTLS_INCLUDE_DIR MBEDTLS_LIBRARY MBEDX509_LIBRARY MBEDCRYPTO_LIBRARY)
 
 if(MBEDTLS_FOUND)
-	add_library(MbedTLS::mbedcrypto UNKNOWN IMPORTED)
-	set_target_properties(MbedTLS::mbedcrypto PROPERTIES
-	    IMPORTED_LOCATION "${MBEDCRYPTO_LIBRARY}"
-	    INTERFACE_INCLUDE_DIRECTORIES "${MBEDTLS_INCLUDE_DIR}"
-	)
+  add_library(MbedTLS::mbedcrypto UNKNOWN IMPORTED)
+  set_target_properties(MbedTLS::mbedcrypto PROPERTIES
+    IMPORTED_LOCATION "${MBEDCRYPTO_LIBRARY}"
+    INTERFACE_INCLUDE_DIRECTORIES "${MBEDTLS_INCLUDE_DIR}"
+  )
 
-	add_library(MbedTLS::mbedx509 UNKNOWN IMPORTED)
-	set_target_properties(MbedTLS::mbedx509 PROPERTIES
-	    IMPORTED_LOCATION "${MBEDX509_LIBRARY}"
-	    INTERFACE_INCLUDE_DIRECTORIES "${MBEDTLS_INCLUDE_DIR}"
-	    INTERFACE_LINK_LIBRARIES MbedTLS::mbedcrypto
-	)
+  add_library(MbedTLS::mbedx509 UNKNOWN IMPORTED)
+  set_target_properties(MbedTLS::mbedx509 PROPERTIES
+    IMPORTED_LOCATION "${MBEDX509_LIBRARY}"
+    INTERFACE_INCLUDE_DIRECTORIES "${MBEDTLS_INCLUDE_DIR}"
+    INTERFACE_LINK_LIBRARIES MbedTLS::mbedcrypto
+  )
 
-	add_library(MbedTLS::mbedtls UNKNOWN IMPORTED)
-	set_target_properties(MbedTLS::mbedtls PROPERTIES
-	    IMPORTED_LOCATION "${MBEDTLS_LIBRARY}"
-	    INTERFACE_INCLUDE_DIRECTORIES "${MBEDTLS_INCLUDE_DIR}"
-	    INTERFACE_LINK_LIBRARIES MbedTLS::mbedx509
-	)
+  add_library(MbedTLS::mbedtls UNKNOWN IMPORTED)
+  set_target_properties(MbedTLS::mbedtls PROPERTIES
+    IMPORTED_LOCATION "${MBEDTLS_LIBRARY}"
+    INTERFACE_INCLUDE_DIRECTORIES "${MBEDTLS_INCLUDE_DIR}"
+    INTERFACE_LINK_LIBRARIES MbedTLS::mbedx509
+  )
 endif()

CMake/FindMINIUPNPC.cmake

@@ -5,16 +5,16 @@ find_path(MINIUPNPC_INCLUDE_DIR miniupnpc.h PATH_SUFFIXES miniupnpc)
 find_library(MINIUPNPC_LIBRARY miniupnpc)
 
 if(MINIUPNPC_INCLUDE_DIR)
-	file(STRINGS "${MINIUPNPC_INCLUDE_DIR}/miniupnpc.h" MINIUPNPC_VERSION_STR REGEX "^#define[\t ]+MINIUPNPC_VERSION[\t ]+.*")
-	if(MINIUPNPC_VERSION_STR)
-		string(REGEX REPLACE "^#define[\t ]+MINIUPNPC_VERSION[\t ]+\"([.0-9]+)\"" "\\1" MINIUPNPC_VERSION ${MINIUPNPC_VERSION_STR})
-	endif()
+  file(STRINGS "${MINIUPNPC_INCLUDE_DIR}/miniupnpc.h" MINIUPNPC_VERSION_STR REGEX "^#define[\t ]+MINIUPNPC_VERSION[\t ]+.*")
+  if(MINIUPNPC_VERSION_STR)
+    string(REGEX REPLACE "^#define[\t ]+MINIUPNPC_VERSION[\t ]+\"([.0-9]+)\"" "\\1" MINIUPNPC_VERSION ${MINIUPNPC_VERSION_STR})
+  endif()
 endif()
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(MINIUPNPC
-	REQUIRED_VARS MINIUPNPC_INCLUDE_DIR MINIUPNPC_LIBRARY
-	VERSION_VAR MINIUPNPC_VERSION
+  REQUIRED_VARS MINIUPNPC_INCLUDE_DIR MINIUPNPC_LIBRARY
+  VERSION_VAR MINIUPNPC_VERSION
 )
 
 set(MINIUPNPC_LIBRARIES ${MINIUPNPC_LIBRARY})

CMake/FindSFML.cmake

@@ -52,13 +52,13 @@
 
 # define the SFML_STATIC macro if static build was chosen
 if(SFML_STATIC_LIBRARIES)
-    add_definitions(-DSFML_STATIC)
+  add_definitions(-DSFML_STATIC)
 endif()
 
 # deduce the libraries suffix from the options
 set(FIND_SFML_LIB_SUFFIX "")
 if(SFML_STATIC_LIBRARIES)
-    set(FIND_SFML_LIB_SUFFIX "${FIND_SFML_LIB_SUFFIX}-s")
+  set(FIND_SFML_LIB_SUFFIX "${FIND_SFML_LIB_SUFFIX}-s")
 endif()
 
 # find the SFML include directory
@@ -79,41 +79,41 @@ find_path(SFML_INCLUDE_DIR SFML/Config.hpp
 # check the version number
 set(SFML_VERSION_OK TRUE)
 if(SFML_FIND_VERSION AND SFML_INCLUDE_DIR)
-    # extract the major and minor version numbers from SFML/Config.hpp
-    # we have to handle framework a little bit differently :
-    if("${SFML_INCLUDE_DIR}" MATCHES "SFML.framework")
-        set(SFML_CONFIG_HPP_INPUT "${SFML_INCLUDE_DIR}/Headers/Config.hpp")
-    else()
-        set(SFML_CONFIG_HPP_INPUT "${SFML_INCLUDE_DIR}/SFML/Config.hpp")
-    endif()
-    FILE(READ "${SFML_CONFIG_HPP_INPUT}" SFML_CONFIG_HPP_CONTENTS)
-    STRING(REGEX MATCH "#define SFML_VERSION_MAJOR[ \t]+([0-9]+)" SFML_VERSION_MAJOR_MATCH "${SFML_CONFIG_HPP_CONTENTS}")
-    STRING(REGEX MATCH "#define SFML_VERSION_MINOR[ \t]+([0-9]+)" SFML_VERSION_MINOR_MATCH "${SFML_CONFIG_HPP_CONTENTS}")
-    STRING(REGEX REPLACE "#define SFML_VERSION_MAJOR[ \t]+([0-9]+)" "\\1" SFML_VERSION_MAJOR "${SFML_VERSION_MAJOR_MATCH}")
-    STRING(REGEX REPLACE "#define SFML_VERSION_MINOR[ \t]+([0-9]+)" "\\1" SFML_VERSION_MINOR "${SFML_VERSION_MINOR_MATCH}")
-    math(EXPR SFML_REQUESTED_VERSION "${SFML_FIND_VERSION_MAJOR} * 10 + ${SFML_FIND_VERSION_MINOR}")
+  # extract the major and minor version numbers from SFML/Config.hpp
+  # we have to handle framework a little bit differently :
+  if("${SFML_INCLUDE_DIR}" MATCHES "SFML.framework")
+    set(SFML_CONFIG_HPP_INPUT "${SFML_INCLUDE_DIR}/Headers/Config.hpp")
+  else()
+    set(SFML_CONFIG_HPP_INPUT "${SFML_INCLUDE_DIR}/SFML/Config.hpp")
+  endif()
+  FILE(READ "${SFML_CONFIG_HPP_INPUT}" SFML_CONFIG_HPP_CONTENTS)
+  STRING(REGEX MATCH "#define SFML_VERSION_MAJOR[ \t]+([0-9]+)" SFML_VERSION_MAJOR_MATCH "${SFML_CONFIG_HPP_CONTENTS}")
+  STRING(REGEX MATCH "#define SFML_VERSION_MINOR[ \t]+([0-9]+)" SFML_VERSION_MINOR_MATCH "${SFML_CONFIG_HPP_CONTENTS}")
+  STRING(REGEX REPLACE "#define SFML_VERSION_MAJOR[ \t]+([0-9]+)" "\\1" SFML_VERSION_MAJOR "${SFML_VERSION_MAJOR_MATCH}")
+  STRING(REGEX REPLACE "#define SFML_VERSION_MINOR[ \t]+([0-9]+)" "\\1" SFML_VERSION_MINOR "${SFML_VERSION_MINOR_MATCH}")
+  math(EXPR SFML_REQUESTED_VERSION "${SFML_FIND_VERSION_MAJOR} * 10 + ${SFML_FIND_VERSION_MINOR}")
 
-    # if we could extract them, compare with the requested version number
-    if (SFML_VERSION_MAJOR)
-        # transform version numbers to an integer
-        math(EXPR SFML_VERSION "${SFML_VERSION_MAJOR} * 10 + ${SFML_VERSION_MINOR}")
+  # if we could extract them, compare with the requested version number
+  if (SFML_VERSION_MAJOR)
+    # transform version numbers to an integer
+    math(EXPR SFML_VERSION "${SFML_VERSION_MAJOR} * 10 + ${SFML_VERSION_MINOR}")
 
-        # compare them
-        if(SFML_VERSION LESS SFML_REQUESTED_VERSION)
-            set(SFML_VERSION_OK FALSE)
-        endif()
-    else()
-        # SFML version is < 3.0
-        if (SFML_REQUESTED_VERSION GREATER 29)
-            set(SFML_VERSION_OK FALSE)
-            if (SFML_REQUESTED_VERSION GREATER 19)
-                set(SFML_VERSION_MAJOR 1)
-            else()
-                set(SFML_VERSION_MAJOR 2)
-            endif()
-            set(SFML_VERSION_MINOR x)
-        endif()
+    # compare them
+    if(SFML_VERSION LESS SFML_REQUESTED_VERSION)
+      set(SFML_VERSION_OK FALSE)
     endif()
+  else()
+    # SFML version is < 3.0
+    if (SFML_REQUESTED_VERSION GREATER 29)
+      set(SFML_VERSION_OK FALSE)
+      if (SFML_REQUESTED_VERSION GREATER 19)
+        set(SFML_VERSION_MAJOR 1)
+      else()
+        set(SFML_VERSION_MAJOR 2)
+      endif()
+      set(SFML_VERSION_MINOR x)
+    endif()
+  endif()
 endif()
 
 # find the requested modules
@@ -130,101 +130,101 @@ set(FIND_SFML_LIB_PATHS
     /opt/csw
     /opt)
 foreach(FIND_SFML_COMPONENT ${SFML_FIND_COMPONENTS})
-    string(TOLOWER ${FIND_SFML_COMPONENT} FIND_SFML_COMPONENT_LOWER)
-    string(TOUPPER ${FIND_SFML_COMPONENT} FIND_SFML_COMPONENT_UPPER)
-    set(FIND_SFML_COMPONENT_NAME sfml-${FIND_SFML_COMPONENT_LOWER}${FIND_SFML_LIB_SUFFIX})
+  string(TOLOWER ${FIND_SFML_COMPONENT} FIND_SFML_COMPONENT_LOWER)
+  string(TOUPPER ${FIND_SFML_COMPONENT} FIND_SFML_COMPONENT_UPPER)
+  set(FIND_SFML_COMPONENT_NAME sfml-${FIND_SFML_COMPONENT_LOWER}${FIND_SFML_LIB_SUFFIX})
 
-    # no suffix for sfml-main, it is always a static library
-    if(FIND_SFML_COMPONENT_LOWER STREQUAL "main")
-        set(FIND_SFML_COMPONENT_NAME sfml-${FIND_SFML_COMPONENT_LOWER})
+  # no suffix for sfml-main, it is always a static library
+  if(FIND_SFML_COMPONENT_LOWER STREQUAL "main")
+    set(FIND_SFML_COMPONENT_NAME sfml-${FIND_SFML_COMPONENT_LOWER})
+  endif()
+
+  # debug library
+  find_library(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG
+                NAMES ${FIND_SFML_COMPONENT_NAME}-d
+                PATH_SUFFIXES lib64 lib
+                PATHS ${FIND_SFML_LIB_PATHS})
+
+  # release library
+  find_library(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE
+                NAMES ${FIND_SFML_COMPONENT_NAME}
+                PATH_SUFFIXES lib64 lib
+                PATHS ${FIND_SFML_LIB_PATHS})
+
+  if (SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG OR SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE)
+    # library found
+    set(SFML_${FIND_SFML_COMPONENT_UPPER}_FOUND TRUE)
+
+    # if both are found, set SFML_XXX_LIBRARY to contain both
+    if (SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG AND SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE)
+      set(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY debug     ${SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG}
+                                                    optimized ${SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE})
     endif()
 
-    # debug library
-    find_library(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG
-                 NAMES ${FIND_SFML_COMPONENT_NAME}-d
-                 PATH_SUFFIXES lib64 lib
-                 PATHS ${FIND_SFML_LIB_PATHS})
-
-    # release library
-    find_library(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE
-                 NAMES ${FIND_SFML_COMPONENT_NAME}
-                 PATH_SUFFIXES lib64 lib
-                 PATHS ${FIND_SFML_LIB_PATHS})
-
-    if (SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG OR SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE)
-        # library found
-        set(SFML_${FIND_SFML_COMPONENT_UPPER}_FOUND TRUE)
-
-        # if both are found, set SFML_XXX_LIBRARY to contain both
-        if (SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG AND SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE)
-            set(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY debug     ${SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG}
-                                                          optimized ${SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE})
-        endif()
-
-        # if only one debug/release variant is found, set the other to be equal to the found one
-        if (SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG AND NOT SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE)
-            # debug and not release
-            set(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE ${SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG})
-            set(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY         ${SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG})
-        endif()
-        if (SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE AND NOT SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG)
-            # release and not debug
-            set(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG ${SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE})
-            set(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY       ${SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE})
-        endif()
-    else()
-        # library not found
-        set(SFML_FOUND FALSE)
-        set(SFML_${FIND_SFML_COMPONENT_UPPER}_FOUND FALSE)
-        set(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY "")
-        set(FIND_SFML_MISSING "${FIND_SFML_MISSING} SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY")
+    # if only one debug/release variant is found, set the other to be equal to the found one
+    if (SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG AND NOT SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE)
+      # debug and not release
+      set(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE ${SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG})
+      set(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY         ${SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG})
     endif()
+    if (SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE AND NOT SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG)
+      # release and not debug
+      set(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG ${SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE})
+      set(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY       ${SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE})
+    endif()
+  else()
+    # library not found
+    set(SFML_FOUND FALSE)
+    set(SFML_${FIND_SFML_COMPONENT_UPPER}_FOUND FALSE)
+    set(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY "")
+    set(FIND_SFML_MISSING "${FIND_SFML_MISSING} SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY")
+  endif()
 
-    # mark as advanced
-    MARK_AS_ADVANCED(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY
-                     SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE
-                     SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG)
+  # mark as advanced
+  MARK_AS_ADVANCED(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY
+                    SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE
+                    SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG)
 
-    # add to the global list of libraries
-    set(SFML_LIBRARIES ${SFML_LIBRARIES} "${SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY}")
+  # add to the global list of libraries
+  set(SFML_LIBRARIES ${SFML_LIBRARIES} "${SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY}")
 endforeach()
 
 # handle errors
 if(NOT SFML_VERSION_OK)
-    # SFML version not ok
-    set(FIND_SFML_ERROR "SFML found but version too low (requested: ${SFML_FIND_VERSION}, found: ${SFML_VERSION_MAJOR}.${SFML_VERSION_MINOR})")
-    set(SFML_FOUND FALSE)
+  # SFML version not ok
+  set(FIND_SFML_ERROR "SFML found but version too low (requested: ${SFML_FIND_VERSION}, found: ${SFML_VERSION_MAJOR}.${SFML_VERSION_MINOR})")
+  set(SFML_FOUND FALSE)
 elseif(NOT SFML_FOUND)
-    # include directory or library not found
-    set(FIND_SFML_ERROR "Could NOT find SFML (missing: ${FIND_SFML_MISSING})")
+  # include directory or library not found
+  set(FIND_SFML_ERROR "Could NOT find SFML (missing: ${FIND_SFML_MISSING})")
 endif()
 if (NOT SFML_FOUND)
-    if(SFML_FIND_REQUIRED)
-        # fatal error
-        message(FATAL_ERROR ${FIND_SFML_ERROR})
-    elseif(NOT SFML_FIND_QUIETLY)
-        # error but continue
-        message(STATUS "${FIND_SFML_ERROR}")
-    endif()
+  if(SFML_FIND_REQUIRED)
+    # fatal error
+    message(FATAL_ERROR ${FIND_SFML_ERROR})
+  elseif(NOT SFML_FIND_QUIETLY)
+    # error but continue
+    message(STATUS "${FIND_SFML_ERROR}")
+  endif()
 endif()
 
 # handle success
 if(SFML_FOUND)
-    message(STATUS "Found SFML ${SFML_VERSION_MAJOR}.${SFML_VERSION_MINOR} in ${SFML_INCLUDE_DIR}")
-    foreach(FIND_SFML_COMPONENT ${SFML_FIND_COMPONENTS})
-        string(TOLOWER ${FIND_SFML_COMPONENT} FIND_SFML_COMPONENT_LOWER)
-        string(TOUPPER ${FIND_SFML_COMPONENT} FIND_SFML_COMPONENT_UPPER)
-        if(NOT TARGET sfml-${FIND_SFML_COMPONENT_LOWER})
-            add_library(sfml-${FIND_SFML_COMPONENT_LOWER} UNKNOWN IMPORTED)
-            set_target_properties(sfml-${FIND_SFML_COMPONENT_LOWER} PROPERTIES
-                IMPORTED_LOCATION "${SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY}"
-                INTERFACE_INCLUDE_DIRECTORIES "${SFML_INCLUDE_DIR}"
-            )
-            if(NOT ${FIND_SFML_COMPONENT_LOWER} STREQUAL system)
-                set_target_properties(sfml-${FIND_SFML_COMPONENT_LOWER} PROPERTIES
-                    INTERFACE_LINK_LIBRARIES sfml-system
-                )
-            endif()
-        endif()
-    endforeach()
+  message(STATUS "Found SFML ${SFML_VERSION_MAJOR}.${SFML_VERSION_MINOR} in ${SFML_INCLUDE_DIR}")
+  foreach(FIND_SFML_COMPONENT ${SFML_FIND_COMPONENTS})
+    string(TOLOWER ${FIND_SFML_COMPONENT} FIND_SFML_COMPONENT_LOWER)
+    string(TOUPPER ${FIND_SFML_COMPONENT} FIND_SFML_COMPONENT_UPPER)
+    if(NOT TARGET sfml-${FIND_SFML_COMPONENT_LOWER})
+      add_library(sfml-${FIND_SFML_COMPONENT_LOWER} UNKNOWN IMPORTED)
+      set_target_properties(sfml-${FIND_SFML_COMPONENT_LOWER} PROPERTIES
+        IMPORTED_LOCATION "${SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY}"
+        INTERFACE_INCLUDE_DIRECTORIES "${SFML_INCLUDE_DIR}"
+      )
+      if(NOT ${FIND_SFML_COMPONENT_LOWER} STREQUAL system)
+        set_target_properties(sfml-${FIND_SFML_COMPONENT_LOWER} PROPERTIES
+          INTERFACE_LINK_LIBRARIES sfml-system
+        )
+      endif()
+    endif()
+  endforeach()
 endif()

CMake/FindSYSTEMD.cmake

@@ -2,28 +2,28 @@ find_package(PkgConfig QUIET)
 pkg_check_modules(PC_SYSTEMD QUIET "libsystemd")
 
 if (PC_SYSTEMD_FOUND)
-	add_definitions(${PC_SYSTEMD_CFLAGS} ${PC_SYSTEMD_CFLAGS_OTHER})
+  add_definitions(${PC_SYSTEMD_CFLAGS} ${PC_SYSTEMD_CFLAGS_OTHER})
 endif(PC_SYSTEMD_FOUND)
 
 find_path(
-    SYSTEMD_INCLUDE_DIRS
-    NAMES systemd/sd-daemon.h
-    HINTS ${PC_SYSTEMD_INCLUDEDIR} ${PC_SYSTEMD_INCLUDE_DIRS}
+  SYSTEMD_INCLUDE_DIRS
+  NAMES systemd/sd-daemon.h
+  HINTS ${PC_SYSTEMD_INCLUDEDIR} ${PC_SYSTEMD_INCLUDE_DIRS}
 )
 
 find_library(
-    SYSTEMD_LIBRARIES
-    NAMES systemd
-    HINTS ${PC_SYSTEMD_LIBDIR} ${PC_SYSTEMD_LIBRARY_DIRS}
+  SYSTEMD_LIBRARIES
+  NAMES systemd
+  HINTS ${PC_SYSTEMD_LIBDIR} ${PC_SYSTEMD_LIBRARY_DIRS}
 )
 
 include(FindPackageHandleStandardArgs)
 
 find_package_handle_standard_args(
-    SYSTEMD
-    REQUIRED_VARS SYSTEMD_LIBRARIES SYSTEMD_INCLUDE_DIRS
+  SYSTEMD
+  REQUIRED_VARS SYSTEMD_LIBRARIES SYSTEMD_INCLUDE_DIRS
 )
 mark_as_advanced(
-    SYSTEMD_FOUND
-    SYSTEMD_LIBRARIES SYSTEMD_INCLUDE_DIRS
+  SYSTEMD_FOUND
+  SYSTEMD_LIBRARIES SYSTEMD_INCLUDE_DIRS
 )

CMake/RemoveCompileFlag.cmake

@@ -8,9 +8,9 @@
 #   _flag       - The compile flag to remove
 #
 macro(remove_cxx_flag_from_target _target _flag)
-    get_target_property(_target_cxx_flags ${_target} COMPILE_OPTIONS)
-    if(_target_cxx_flags)
-        list(REMOVE_ITEM _target_cxx_flags ${_flag})
-        set_target_properties(${_target} PROPERTIES COMPILE_OPTIONS "${_target_cxx_flags}")
-    endif()
+  get_target_property(_target_cxx_flags ${_target} COMPILE_OPTIONS)
+  if(_target_cxx_flags)
+    list(REMOVE_ITEM _target_cxx_flags ${_flag})
+    set_target_properties(${_target} PROPERTIES COMPILE_OPTIONS "${_target_cxx_flags}")
+  endif()
 endmacro()

CMakeLists.txt

@@ -1,23 +1,10 @@
 ########################################
 # General setup
 #
-cmake_minimum_required(VERSION 3.13)
+cmake_minimum_required(VERSION 3.20...4.2.1)
 
-cmake_policy(SET CMP0079 NEW) # let target_link_libraries() link to a target defined in a different directory
 cmake_policy(SET CMP0080 OLD) # allow using BundleUtilities at configure time
 
-if (POLICY CMP0099)
-  cmake_policy(SET CMP0099 NEW) # Propagate INTERFACE_LINK_OPTIONS from private dependencies, used by MacOS framework builds of SDL
-endif()
-
-# Weird chicken-and-egg problem: We can't check the compiler before the project() call, but we have to set the policies before it.
-# So we do this in two steps: Set the policies if they exist, then error out afterwards if we end up being MSVC and they don't exist.
-if (POLICY CMP0117)
-  cmake_policy(SET CMP0091 NEW) # MSVC runtime library flags are selected by an abstraction.
-  cmake_policy(SET CMP0092 NEW) # MSVC warning flags are not in CMAKE_{C,CXX}_FLAGS by default.
-  cmake_policy(SET CMP0117 NEW) # MSVC RTTI flag will not be added by default.
-endif()
-
 if (POLICY CMP0141)
   cmake_policy(SET CMP0141 NEW) # MSVC debug information format flags are selected by an abstraction.
 endif()
@@ -28,6 +15,12 @@ set(CMAKE_OSX_DEPLOYMENT_TARGET "11.0.0" CACHE STRING "")
 
 set(CMAKE_USER_MAKE_RULES_OVERRIDE "${CMAKE_CURRENT_SOURCE_DIR}/CMake/FlagsOverride.cmake")
 
+# CMake 3.28 and later scan c++ source files for module imports by default. Since we don't use
+# modules scanning is pointless, so disable it. This also prevents Clang from generating an error
+# if the clang-scan-deps tool isn't installed:
+# "CMAKE_CXX_COMPILER_CLANG_SCAN_DEPS-NOTFOUND: not found".
+set(CMAKE_CXX_SCAN_FOR_MODULES OFF)
+
 project(dolphin-emu)
 
 if (CMAKE_VERSION VERSION_LESS "3.25" AND CMAKE_SYSTEM_NAME MATCHES "Linux")
@@ -35,12 +28,6 @@ if (CMAKE_VERSION VERSION_LESS "3.25" AND CMAKE_SYSTEM_NAME MATCHES "Linux")
 endif()
 
 if (MSVC)
-  if (POLICY CMP0117)
-    # cmake is a weird language. You can't do if(not POLICY)
-  else()
-    message(FATAL_ERROR "Please update to CMake 3.20 or higher.")
-  endif()
-
   set(CMAKE_C_STANDARD 99)
   set(CMAKE_CXX_STANDARD 23)
   set(CMAKE_CXX_STANDARD_REQUIRED ON)
@@ -51,12 +38,12 @@ if (COMPILER STREQUAL "GNU")
   set(COMPILER "GCC") # prefer printing GCC instead of GNU
 endif()
 
-# Enforce minimum compiler versions that support the c++20 features we use
-set (GCC_min_version 11)
-set (Clang_min_version 14)
+# Enforce minimum compiler versions that support the c++23 features we use
+set (GCC_min_version 12)
+set (Clang_min_version 15)
 set (AppleClang_min_version 14.0.3)
-set (min_xcode_version "14.0") # corresponding xcode version for AppleClang_min_version
-set (MSVC_min_version 14.32)
+set (min_xcode_version "14.3") # corresponding xcode version for AppleClang_min_version
+set (MSVC_min_version 19.32)
 set (min_vs_version "2022 17.2.3") # corresponding Visual Studio version for MSVC_min_version
 
 message(STATUS "Using ${COMPILER} ${CMAKE_CXX_COMPILER_VERSION}")
@@ -149,7 +136,7 @@ if(APPLE)
   enable_language(OBJC)
   enable_language(OBJCXX)
   option(MACOS_USE_DEFAULT_SEARCH_PATH "Don't prioritize system library paths" OFF)
-  option(SKIP_POSTPROCESS_BUNDLE "Skip postprocessing bundle for redistributability" OFF)
+  option(POSTPROCESS_BUNDLE "Postprocess bundle for redistributability" OFF)
   # Enable adhoc code signing by default (otherwise makefile builds on ARM will not work)
   option(MACOS_CODE_SIGNING "Enable codesigning" ON)
   option(USE_BUNDLED_MOLTENVK "Build MoltenVK from Externals with Dolphin-specific patches" ON)
@@ -235,11 +222,11 @@ if(ENABLE_GENERIC)
   message(STATUS "Warning! Building generic build!")
   set(_M_GENERIC 1)
   add_definitions(-D_M_GENERIC=1)
-elseif(_ARCH_64 AND CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|amd64|AMD64")
+elseif(_ARCH_64 AND CMAKE_SYSTEM_PROCESSOR MATCHES "x64|x86_64|amd64|AMD64")
   set(_M_X86_64 1)
   add_definitions(-D_M_X86_64=1)
   check_and_add_flag(HAVE_SSE2 -msse2)
-elseif(_ARCH_64 AND CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|arm64")
+elseif(_ARCH_64 AND CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|arm64|ARM64")
   set(_M_ARM_64 1)
   add_definitions(-D_M_ARM_64=1)
   # CRC instruction set is used in the CRC32 hash function
@@ -369,7 +356,7 @@ if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
   set(CMAKE_XCODE_ATTRIBUTE_GCC_STRICT_ALIASING NO)
 
   # Specify target CPUs.
-  if(_ARCH_64 AND CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|amd64|AMD64")
+  if(_ARCH_64 AND _M_X86_64)
     check_and_add_flag(HAVE_MSSSE3 -mssse3)
     check_and_add_flag(HAVE_ARCH_CORE2 -march=core2)
   endif()
@@ -396,15 +383,13 @@ if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
 endif()
 
 if(ENABLE_LTO)
-  if(CMAKE_C_COMPILER_ID MATCHES "MSVC")
-    add_compile_options(/GL)
-    string(APPEND CMAKE_EXE_LINKER_FLAGS " /LTCG")
+  include(CheckIPOSupported)
+  check_ipo_supported(RESULT supported OUTPUT error)
+
+  if(supported)
+    set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
   else()
-    check_and_add_flag(LTO -flto)
-    if(CMAKE_CXX_COMPILER_ID STREQUAL GNU)
-      set(CMAKE_AR gcc-ar)
-      set(CMAKE_RANLIB gcc-ranlib)
-    endif()
+    message(STATUS "IPO / LTO not supported: <${error}>")
   endif()
 endif()
 
@@ -734,7 +719,7 @@ if(ENABLE_VULKAN)
   endif()
 endif()
 
-if(NOT WIN32 OR (NOT (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")))
+if(NOT (WIN32 AND _M_ARM_64))
   # OpenGL is available on all platforms except windows-arm64
   add_definitions(-DHAS_OPENGL)
 endif()
@@ -756,7 +741,7 @@ dolphin_find_optional_system_library_pkgconfig(ZSTD libzstd>=1.4.0 zstd::zstd Ex
 dolphin_find_optional_system_library_pkgconfig(ZLIB zlib>=1.3.1 ZLIB::ZLIB Externals/zlib-ng)
 
 dolphin_find_optional_system_library_pkgconfig(minizip-ng
-  "minizip-ng>=4.0.4" minizip-ng::minizip-ng Externals/minizip-ng
+  "minizip-ng>=4.0.4" MINIZIP::minizip-ng Externals/minizip-ng
 )
 
 dolphin_find_optional_system_library(LZO Externals/LZO)
@@ -847,15 +832,17 @@ add_subdirectory(Externals/rangeset)
 add_subdirectory(Externals/FatFs)
 
 if (USE_RETRO_ACHIEVEMENTS)
-	add_subdirectory(Externals/rcheevos)
+  add_subdirectory(Externals/rcheevos)
 endif()
 
 if (NOT IOS)
   add_subdirectory(Externals/watcher)
 endif()
 
-if(WIN32 OR LINUX)
+# Any other platform or BSD is currently unsupported by cpp-ipc
+if(WIN32 OR LINUX OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "QNX")
   add_subdirectory(Externals/cpp-ipc)
+  add_definitions(-DHAVE_CPPIPC)
 endif()
 
 ########################################
@@ -868,7 +855,7 @@ file(REMOVE "${PROJECT_SOURCE_DIR}/Source/Core/Common/scmrev.h")
 
 file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Source/Core/Common)
 if (NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/Source/Core/Common/scmrev.h)
-	file(TOUCH ${CMAKE_CURRENT_BINARY_DIR}/Source/Core/Common/scmrev.h)
+  file(TOUCH ${CMAKE_CURRENT_BINARY_DIR}/Source/Core/Common/scmrev.h)
 endif()
 
 if(APPLE)
@@ -887,13 +874,13 @@ endif()
 
 find_package(Git)
 if(NOT GIT_FOUND)
-	set(GIT_EXECUTABLE "")
+  set(GIT_EXECUTABLE "")
 endif()
 add_custom_target(
-	dolphin_scmrev
-	${CMAKE_COMMAND} -DPROJECT_SOURCE_DIR=${PROJECT_SOURCE_DIR} -DPROJECT_BINARY_DIR=${PROJECT_BINARY_DIR} -DDISTRIBUTOR=${DISTRIBUTOR} -DDOLPHIN_DEFAULT_UPDATE_TRACK=${DOLPHIN_DEFAULT_UPDATE_TRACK} -DGIT_FOUND=${GIT_FOUND} -DGIT_EXECUTABLE=${GIT_EXECUTABLE} -DDOLPHIN_WC_REVISION=${DOLPHIN_WC_REVISION} -DDOLPHIN_WC_DESCRIBE=${DOLPHIN_WC_DESCRIBE} -DDOLPHIN_WC_BRANCH=${DOLPHIN_WC_BRANCH} -DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET} -P ${CMAKE_CURRENT_SOURCE_DIR}/CMake/ScmRevGen.cmake
-	BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/Source/Core/Common/scmrev.h" "${CMAKE_CURRENT_BINARY_DIR}/Source/Core/DolphinQt/Info.plist" "${CMAKE_CURRENT_BINARY_DIR}/Source/Core/MacUpdater/Info.plist" "${CMAKE_CURRENT_BINARY_DIR}/Flatpak/org.DolphinEmu.dolphin-emu.metainfo.xml"
-	VERBATIM
+  dolphin_scmrev
+  ${CMAKE_COMMAND} -DPROJECT_SOURCE_DIR=${PROJECT_SOURCE_DIR} -DPROJECT_BINARY_DIR=${PROJECT_BINARY_DIR} -DDISTRIBUTOR=${DISTRIBUTOR} -DDOLPHIN_DEFAULT_UPDATE_TRACK=${DOLPHIN_DEFAULT_UPDATE_TRACK} -DGIT_FOUND=${GIT_FOUND} -DGIT_EXECUTABLE=${GIT_EXECUTABLE} -DDOLPHIN_WC_REVISION=${DOLPHIN_WC_REVISION} -DDOLPHIN_WC_DESCRIBE=${DOLPHIN_WC_DESCRIBE} -DDOLPHIN_WC_BRANCH=${DOLPHIN_WC_BRANCH} -DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET} -P ${CMAKE_CURRENT_SOURCE_DIR}/CMake/ScmRevGen.cmake
+  BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/Source/Core/Common/scmrev.h" "${CMAKE_CURRENT_BINARY_DIR}/Source/Core/DolphinQt/Info.plist" "${CMAKE_CURRENT_BINARY_DIR}/Source/Core/MacUpdater/Info.plist" "${CMAKE_CURRENT_BINARY_DIR}/Flatpak/org.DolphinEmu.dolphin-emu.metainfo.xml"
+  VERBATIM
 )
 
 # This is here so #include "Common/scmrev.h" finds the generated header.
@@ -930,7 +917,8 @@ if(NOT CMAKE_SYSTEM_NAME MATCHES "Darwin|Windows")
   install(DIRECTORY Data/Sys/ DESTINATION ${datadir}/sys PATTERN)
 endif()
 if(NOT CMAKE_SYSTEM_NAME MATCHES "Linux|FreeBSD|OpenBSD|Darwin")
-  install(FILES Data/license.txt DESTINATION ${datadir})
+  install(FILES COPYING DESTINATION ${datadir})
+  install(DIRECTORY LICENSES DESTINATION ${datadir}/LICENSES PATTERN)
 endif()
 if(CMAKE_SYSTEM_NAME MATCHES "Linux|FreeBSD|OpenBSD")
   # Install the application icon and menu item

Data/Sys/ApprovedInis.json

@@ -1 +1 @@
-{"D43J01":{"loophack":"CAB9CED2D904F12CCB21F5B1DE9B5433620C3E13"},"DPOJ8P":{"Bypass Modem Detection":"90BA66E25640A538FEFA6693715718139079FA7B"},"G2BE5G":{"Disable interlaced rendering":"7FFF6BDD93713BEDFD23739C32B86153FA19AEA0"},"G2BP7D":{"Disable interlaced rendering":"56E85D7285F10348E1E5354E379918D07E79EDA9"},"G2VE08":{"16:9 Widescreen":"3ED033396382424533A263A39687A0961EC994A6"},"G2VP08":{"16:9 Widescreen":"EEBC3C5F04BB70AFCA1A4C3D638335CDC9142BA2"},"G3RP52":{"16:9 Widescreen":"7F6B7743F0DDD3704B15882330E490103AE24E36","60fps":"4C9A8572A35F1DB85BBB2F32ED34288A343F1FC0"},"G3YP52":{"16:9 Widescreen":"3D102AFEE2F4945894E74BB702ED3ED2294C6FEC","Force PAL60":"FD61581C593EA34DD358AE33819FAB310F2CE961"},"G4AEE9":{"16:9 Aspect Ratio Fix":"8C2564CF47BB6A9B57D712C90E17F459B0BB6CCD"},"G4ME69":{"16:9 Widescreen":"6FC6E5D91693FAABE25CC721F2121CB0B5CA9D12"},"G5SE7D":{"16:9 Widescreen":"16119398BFE241A84151C046E0BC5BCF89D22049","Remove Bloom":"A5F2FB2B3BFF61F34F8AB1DD5A912A0FD8DFA720"},"G5SP7D":{"16:9 Widescreen":"718AA8BD831961C33114852FDA75BB58F768F46A"},"G8ME01":{"16:9 Aspect Ratio Fix - Centered HUD":"8C2FC3FC6F7766AA8E87425BF3BDD2E46E73DE71","16:9 Aspect Ratio Fix - Centered HUD with letterboxing":"AE3DBE2604CA0660165CA870C4B80E2B523C9475","16:9 Aspect Ratio Fix - Normal HUD":"F6E8264CF14D0189219C1E2D20C4182F190F4B88","16:9 Aspect Ratio Fix - Stretched HUD":"8EA4C7B80ADE3E8FEC28EEFA3A046B6B04162E81","No Letterbox":"B1DE2A3526F2E4511F2B94A5171BF7B3C2C52B9B"},"G8MJ01":{"16:9 Aspect Ratio Fix - Centered HUD":"B3181CA1AAB11EAE9132184DA48D76E775AC0A24","16:9 Aspect Ratio Fix - Centered HUD with letterboxing":"904C0EEEF16D761F7BDF7099DEB384DD9AB26E00","16:9 Aspect Ratio Fix - Normal HUD":"631CE99BDE3F1475303C00C67E3C130D4EB2547B","16:9 Aspect Ratio Fix - Stretched HUD":"81F7AD591F12A01DE82850457ECF147998D1238F"},"G8MP01":{"16:9 Aspect Ratio Fix - Centered HUD":"75AF5D7FA49BE9C3C73EA1482B49CD9B36CE817E","16:9 Aspect Ratio Fix - Centered HUD with letterboxing":"C2E5003E74551DF693A7CB814850CA51D77549EF","16:9 Aspect Ratio Fix - Normal HUD":"FB26AA84B0CB787705E84E869B649307776A2839","16:9 Aspect Ratio Fix - Stretched HUD":"C5F8A81520193418C07C7BC4881F02BE9C4DC9BC","No Letterbox":"7828F5B0C8B470620755C16C60A5A4554F92640C"},"G9SE8P":{"16:9 Widescreen":"CD043229AC47AC93D537B6A0725A2D0BB6FEF4E8"},"G9SJ8P":{"16:9 Widescreen":"C55EF90B542AA3973352A232629A828BC22A8509"},"G9SP8P":{"16:9 Widescreen":"9521774ADEE769CFCCE86F8170FE626387E73019"},"GAFE01":{"16:9 Widescreen":"D24F6D9BE5D79D3C795C2844634A0214BB68B5DA","Make Game Save Copyable (donny2112)":"F9A812FF62A20D5440CAB79DB6AFAE068457A10E"},"GAHEGG":{"Limit internal frame rate (speed hack)":"2873E5178C8068AFA8AFE751F903A69CA9A41F16"},"GAL":{"Trophy Viewer":"DBDB50216B22CDFFF77BDD80261CD0FF75803D3B"},"GALE01r0":{"Normal C Stick Functionality in Singleplayer Modes":"9DC8D90D986FAC175F45006AFF20CF00EDFBE053","Proper 16:9 Widescreen Support":"18B4159E77013EDFE499A33281B771C442970E3B","Properly Display in 4:3":"DC2BCA7D99EBDE1DC7C68CA6AC7F543B93FD6A67"},"GALE01r1":{"Normal C Stick Functionality in Singleplayer Modes":"F6030959C1CAC92F37287D556F18B3C5298FAD5B"},"GALE01r2":{"Disable Rumble":"CFDEEA8AD2A99394BFFEA7211EF03394E7471FA9","Normal C Stick Functionality in Singleplayer Modes":"BCD918A72368B2A30E797C76994E7539A1C0B5D9","PAL Stock Icons":"6B92D95F0EEA165EA84FD753F74B0A9E2079C2D7","Proper 16:9 Widescreen Support":"CEDF18354CDCFC49398551C629E51B053331A55B","Widescreen Support v1.2 [Dan Salvato]":"D32ED4CD685F3FF649F7E749E8C182C657013918"},"GALP01":{"Normal C Stick Functionality in Singleplayer Modes":"4817F202678559291F9F76B46DC7561A45D00B77","Proper 16:9 Widescreen Support":"BFCBE098FE8679B9140A48EA1D8620D5A369697C","Properly Display in 4:3":"5BA2933B8365E21553AA273B91954A4C722B1035"},"GAZE69":{"60FPS":"BC281053C5266B21FDDC6C8996A6021DEA03D459"},"GBLE52":{"16:9 Widescreen":"C0F3AB3BBC9B21F4BF25F44E48CF1CD36D2B3F45"},"GBLP52":{"16:9 Widescreen":"797040CB097BFD369490A1BE29659929D76CE6F7"},"GBRJ18":{"16:9 Widescreen":"B3C867AB34D90E2E9C5B799D800F4C191DE279FA"},"GBSE8P":{"16:9 Widescreen":"4148D453F61A5B81E53669335BC667E651865C76"},"GBSP8P":{"16:9 Widescreen":"6CB029AE768BA5B9995D5F12C1EBB37B3D1FE242"},"GC6E01":{"16:9 Widescreen":"DE932CCAD1B5EB1FAA8D08733BD0D3940C78382A","60 FPS [Nerdzilla]":"85F98064F17AFE0FB02A99A182AF3FEB7644DCAA","Allow Memory Card saving with Savestates":"2F64F98686E62B60E466E931A9EBCD19A750FF4E"},"GC6J01":{"60 FPS [Nerdzilla]":"A6146772E37970EA5564F51A622A04792158B321","Allow Memory Card saving with Savestates":"D8F327304A88FBC717BB1F775494C5F864B9E8D2"},"GC6P01":{"16:9 Widescreen [Ralf]":"05C9016BF58A628A3FD7B16E1B9BB0769A14846F","60 FPS [Nerdzilla]":"1D3FB017C0D20754E48A8BA54EEE7DC4851BE84B","Allow Memory Card saving with Savestates":"EDEE0E28EEA1834868F2865336290FFBDFB9C6DA"},"GC8JA4":{"Fix C4 texture tiling (used for buttons and some character icons)":"843297019804192AF1FC660BC85F4B10891D0BA3"},"GCBE7D":{"16:9 Widescreen":"478DA1D596D8513C343850719155813CLine truncated
+{"D43J01":{"loophack":"CAB9CED2D904F12CCB21F5B1DE9B5433620C3E13"},"DPOJ8P":{"Bypass Modem Detection":"90BA66E25640A538FEFA6693715718139079FA7B"},"G2BE5G":{"Disable interlaced rendering":"7FFF6BDD93713BEDFD23739C32B86153FA19AEA0"},"G2BP7D":{"Disable interlaced rendering":"56E85D7285F10348E1E5354E379918D07E79EDA9"},"G2VE08":{"16:9 Widescreen":"3ED033396382424533A263A39687A0961EC994A6"},"G2VP08":{"16:9 Widescreen":"EEBC3C5F04BB70AFCA1A4C3D638335CDC9142BA2"},"G3RP52":{"16:9 Widescreen":"7F6B7743F0DDD3704B15882330E490103AE24E36","60fps":"4C9A8572A35F1DB85BBB2F32ED34288A343F1FC0"},"G3YP52":{"16:9 Widescreen":"3D102AFEE2F4945894E74BB702ED3ED2294C6FEC","Force PAL60":"FD61581C593EA34DD358AE33819FAB310F2CE961"},"G4AEE9":{"16:9 Aspect Ratio Fix":"8C2564CF47BB6A9B57D712C90E17F459B0BB6CCD"},"G4ME69":{"16:9 Widescreen":"6FC6E5D91693FAABE25CC721F2121CB0B5CA9D12"},"G5SE7D":{"16:9 Widescreen":"16119398BFE241A84151C046E0BC5BCF89D22049","Remove Bloom":"A5F2FB2B3BFF61F34F8AB1DD5A912A0FD8DFA720"},"G5SP7D":{"16:9 Widescreen":"718AA8BD831961C33114852FDA75BB58F768F46A"},"G8ME01":{"16:9 Aspect Ratio Fix - Centered HUD":"8C2FC3FC6F7766AA8E87425BF3BDD2E46E73DE71","16:9 Aspect Ratio Fix - Centered HUD with letterboxing":"AE3DBE2604CA0660165CA870C4B80E2B523C9475","16:9 Aspect Ratio Fix - Normal HUD":"F6E8264CF14D0189219C1E2D20C4182F190F4B88","16:9 Aspect Ratio Fix - Stretched HUD":"8EA4C7B80ADE3E8FEC28EEFA3A046B6B04162E81","No Letterbox":"B1DE2A3526F2E4511F2B94A5171BF7B3C2C52B9B"},"G8MJ01":{"16:9 Aspect Ratio Fix - Centered HUD":"B3181CA1AAB11EAE9132184DA48D76E775AC0A24","16:9 Aspect Ratio Fix - Centered HUD with letterboxing":"904C0EEEF16D761F7BDF7099DEB384DD9AB26E00","16:9 Aspect Ratio Fix - Normal HUD":"631CE99BDE3F1475303C00C67E3C130D4EB2547B","16:9 Aspect Ratio Fix - Stretched HUD":"81F7AD591F12A01DE82850457ECF147998D1238F"},"G8MP01":{"16:9 Aspect Ratio Fix - Centered HUD":"75AF5D7FA49BE9C3C73EA1482B49CD9B36CE817E","16:9 Aspect Ratio Fix - Centered HUD with letterboxing":"C2E5003E74551DF693A7CB814850CA51D77549EF","16:9 Aspect Ratio Fix - Normal HUD":"FB26AA84B0CB787705E84E869B649307776A2839","16:9 Aspect Ratio Fix - Stretched HUD":"C5F8A81520193418C07C7BC4881F02BE9C4DC9BC","No Letterbox":"7828F5B0C8B470620755C16C60A5A4554F92640C"},"G9SE8P":{"16:9 Widescreen":"CD043229AC47AC93D537B6A0725A2D0BB6FEF4E8"},"G9SJ8P":{"16:9 Widescreen":"C55EF90B542AA3973352A232629A828BC22A8509"},"G9SP8P":{"16:9 Widescreen":"9521774ADEE769CFCCE86F8170FE626387E73019"},"GAFE01":{"16:9 Widescreen":"D24F6D9BE5D79D3C795C2844634A0214BB68B5DA","Make Game Save Copyable (donny2112)":"F9A812FF62A20D5440CAB79DB6AFAE068457A10E"},"GAHEGG":{"Limit internal frame rate (speed hack)":"2873E5178C8068AFA8AFE751F903A69CA9A41F16"},"GAL":{"Trophy Viewer":"DBDB50216B22CDFFF77BDD80261CD0FF75803D3B"},"GALE01r0":{"Normal C Stick Functionality in Singleplayer Modes":"9DC8D90D986FAC175F45006AFF20CF00EDFBE053","Proper 16:9 Widescreen Support":"18B4159E77013EDFE499A33281B771C442970E3B","Properly Display in 4:3":"DC2BCA7D99EBDE1DC7C68CA6AC7F543B93FD6A67"},"GALE01r1":{"Normal C Stick Functionality in Singleplayer Modes":"F6030959C1CAC92F37287D556F18B3C5298FAD5B"},"GALE01r2":{"Disable Rumble":"CFDEEA8AD2A99394BFFEA7211EF03394E7471FA9","Normal C Stick Functionality in Singleplayer Modes":"BCD918A72368B2A30E797C76994E7539A1C0B5D9","PAL Stock Icons":"6B92D95F0EEA165EA84FD753F74B0A9E2079C2D7","Proper 16:9 Widescreen Support":"CEDF18354CDCFC49398551C629E51B053331A55B","Widescreen Support v1.2 [Dan Salvato]":"D32ED4CD685F3FF649F7E749E8C182C657013918"},"GALP01":{"Normal C Stick Functionality in Singleplayer Modes":"4817F202678559291F9F76B46DC7561A45D00B77","Proper 16:9 Widescreen Support":"BFCBE098FE8679B9140A48EA1D8620D5A369697C","Properly Display in 4:3":"5BA2933B8365E21553AA273B91954A4C722B1035"},"GAZE69":{"60FPS":"BC281053C5266B21FDDC6C8996A6021DEA03D459"},"GBLE52":{"16:9 Widescreen":"C0F3AB3BBC9B21F4BF25F44E48CF1CD36D2B3F45"},"GBLP52":{"16:9 Widescreen":"797040CB097BFD369490A1BE29659929D76CE6F7"},"GBRJ18":{"16:9 Widescreen":"B3C867AB34D90E2E9C5B799D800F4C191DE279FA"},"GBSE8P":{"16:9 Widescreen":"4148D453F61A5B81E53669335BC667E651865C76"},"GBSP8P":{"16:9 Widescreen":"6CB029AE768BA5B9995D5F12C1EBB37B3D1FE242"},"GC6E01":{"16:9 Widescreen":"DE932CCAD1B5EB1FAA8D08733BD0D3940C78382A","60 FPS [Nerdzilla]":"85F98064F17AFE0FB02A99A182AF3FEB7644DCAA","Allow Memory Card saving with Savestates":"2F64F98686E62B60E466E931A9EBCD19A750FF4E"},"GC6J01":{"60 FPS [Nerdzilla]":"A6146772E37970EA5564F51A622A04792158B321","Allow Memory Card saving with Savestates":"D8F327304A88FBC717BB1F775494C5F864B9E8D2"},"GC6P01":{"16:9 Widescreen [Ralf]":"05C9016BF58A628A3FD7B16E1B9BB0769A14846F","60 FPS [Nerdzilla]":"1D3FB017C0D20754E48A8BA54EEE7DC4851BE84B","Allow Memory Card saving with Savestates":"EDEE0E28EEA1834868F2865336290FFBDFB9C6DA"},"GC8JA4":{"Fix C4 texture tiling (used for buttons and some character icons)":"843297019804192AF1FC660BC85F4B10891D0BA3"},"GCBE7D":{"16:9 Widescreen":"478DA1D596D8513C343850719155813CLine truncated

Data/Sys/GameSettings/DLS.ini

@@ -16,4 +16,5 @@ MMU = True
 
 [Video_Hacks]
 EFBToTextureEnable = False
+# Avoids majorly corrupted graphics in menus.
 ImmediateXFBEnable = False

Data/Sys/GameSettings/E62.ini

@@ -14,4 +14,5 @@ CPUThread = False
 SafeTextureCacheColorSamples = 0
 
 [Video_Hacks]
+# Avoids majorly corrupted screen edges.
 ImmediateXFBEnable = False

Data/Sys/GameSettings/E63.ini

@@ -1,4 +1,4 @@
-# E63E8P - Shinobi
+# E63E8P, E63P8P, E63J8P - Shinobi
 
 [Core]
 # Values set here will override the main Dolphin settings.
@@ -14,4 +14,5 @@ CPUThread = False
 SafeTextureCacheColorSamples = 0
 
 [Video_Hacks]
+# Avoids majorly corrupted screen edges.
 ImmediateXFBEnable = False

Data/Sys/GameSettings/E6V.ini

@@ -13,4 +13,5 @@
 SafeTextureCacheColorSamples = 0
 
 [Video_Hacks]
+# Avoids majorly corrupted graphics.
 ImmediateXFBEnable = False

Data/Sys/GameSettings/E6W.ini

@@ -14,4 +14,5 @@ CPUThread = False
 SafeTextureCacheColorSamples = 0
 
 [Video_Hacks]
+# Avoids majorly corrupted screen edges.
 ImmediateXFBEnable = False

Data/Sys/GameSettings/E6X.ini

@@ -14,4 +14,5 @@ CPUThread = False
 SafeTextureCacheColorSamples = 0
 
 [Video_Hacks]
+# Avoids majorly corrupted graphics.
 ImmediateXFBEnable = False

Data/Sys/GameSettings/G2V.ini

@@ -10,5 +10,5 @@
 # Add action replay cheats here.
 
 [Video_Hacks]
+# Avoids stuck black screens during FMVs.
 ImmediateXFBEnable = False
-

Data/Sys/GameSettings/G3L.ini

@@ -1,4 +1,4 @@
-# G3LE8P - Super Monkey Ball Adventure
+# G3LE8P, G3LP8P - Super Monkey Ball Adventure
 
 [Core]
 # Values set here will override the main Dolphin settings.

Data/Sys/GameSettings/G4C.ini

@@ -12,4 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids stuck black screens during FMVs.
 ImmediateXFBEnable = False

Data/Sys/GameSettings/G4S.ini

@@ -1,4 +1,4 @@
-# G4SE01, G4SP01 - The Legend of Zelda: Four Swords
+# G4SE01, G4SP01 - The Legend of Zelda: Four Swords Adventures
 
 [Core]
 # Values set here will override the main Dolphin settings.

Data/Sys/GameSettings/G4SP01.ini

@@ -1,4 +1,4 @@
-# G4SP01 - The Legend of Zelda: Four Swords
+# G4SP01 - The Legend of Zelda: Four Swords Adventures
 
 [OnFrame]
 # Add memory patches to be applied every frame here.

Data/Sys/GameSettings/G5N.ini

@@ -13,4 +13,5 @@
 SafeTextureCacheColorSamples = 0
 
 [Video_Hacks]
+# Avoids flickering during initial loading screen and terrible pacing during game selection.
 ImmediateXFBEnable = False

Data/Sys/GameSettings/G6Q.ini

@@ -13,4 +13,5 @@
 SafeTextureCacheColorSamples = 0
 
 [Video_Hacks]
+# Avoids stuck screens during FMVs.
 ImmediateXFBEnable = False

Data/Sys/GameSettings/GAP.ini

@@ -12,4 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids stuck screens during FMVs.
 ImmediateXFBEnable = False

Data/Sys/GameSettings/GAU.ini

@@ -1,4 +1,4 @@
-# GAUE08, GAUJ08 - auto modellista
+# GAUE08, GAUJ08 - Auto Modellista
 
 [Core]
 # Values set here will override the main Dolphin settings.
@@ -12,5 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids constant flickering while in game.
 ImmediateXFBEnable = False
-

Data/Sys/GameSettings/GAY.ini

@@ -13,4 +13,5 @@
 SafeTextureCacheColorSamples = 0
 
 [Video_Hacks]
+# Avoids stuck black screens during FMVs.
 ImmediateXFBEnable = False

Data/Sys/GameSettings/GBH.ini

@@ -12,5 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids stuck black screens during FMVs.
 ImmediateXFBEnable = False
-

Data/Sys/GameSettings/GBL.ini

@@ -1,4 +1,4 @@
-# GBLE52, GBLP52 - BLOODY ROAR(R): PRIMAL FURY
+# GBLE52, GBLP52, GBRJ18 - Bloody Roar: Primal Fury
 
 [Core]
 # Values set here will override the main Dolphin settings.
@@ -12,5 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids stuck black screens in opening cinematics.
 ImmediateXFBEnable = False
-

Data/Sys/GameSettings/GBM.ini

@@ -1,4 +1,4 @@
-# GBME7F, GBMJ28, GBMP7F - BATMAN: DARK TOMORROW
+# GBME7F, GBMJ28, GBMP7F - Batman: Dark Tomorrow
 
 [Core]
 # Values set here will override the main Dolphin settings.
@@ -12,4 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids stuck black screens during FMVs.
 ImmediateXFBEnable = False

Data/Sys/GameSettings/GBV.ini

@@ -12,4 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
-ImmediateXFBEnable = False
+# Avoids black screens during FMVs.
+ImmediateXFBEnable = False

Data/Sys/GameSettings/GBW.ini

@@ -12,5 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids stuck screens during FMVs.
 ImmediateXFBEnable = False
-

Data/Sys/GameSettings/GC2.ini

@@ -12,4 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids stuck black screens during FMVs.
 ImmediateXFBEnable = False

Data/Sys/GameSettings/GC8JA4.ini

@@ -18,6 +18,7 @@ $Fix C4 texture tiling (used for buttons and some character icons)
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids black screen FMVs, flickering in menus, and broken loading screens.
 ImmediateXFBEnable = False
 
 [AR_RetroAchievements_Verified]

Data/Sys/GameSettings/GCA.ini

@@ -10,4 +10,5 @@
 # Add action replay cheats here.
 
 [Video_Hacks]
+# Avoids stuck black screens during FMVs.
 ImmediateXFBEnable = False

Data/Sys/GameSettings/GCE.ini

@@ -4,4 +4,5 @@
 [ActionReplay]
 [Video_Settings]
 [Video_Hacks]
+# Avoids stuck black screens during FMVs.
 ImmediateXFBEnable = False

Data/Sys/GameSettings/GCN.ini

@@ -18,6 +18,7 @@ $Fix C4 texture tiling (used for buttons and some character icons)
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids black screen FMVs, flickering in menus, and broken loading screens.
 ImmediateXFBEnable = False
 
 [AR_RetroAchievements_Verified]

Data/Sys/GameSettings/GCVEEB.ini

@@ -4,6 +4,7 @@
 # Add memory patches to be applied every frame here.
 
 [Video_Hacks]
+# Avoids shifted screen.
 ImmediateXFBEnable = False
 
 [ActionReplay]

Data/Sys/GameSettings/GD7.ini

@@ -1,4 +1,4 @@
-# GD7JB2, GD7E70, GD7PB2 - Dragon Ball Z: Budokai
+# GD7E70, GD7PB2 - Dragon Ball Z: Budokai
 
 [Video_Hacks]
 # Frame pacing

Data/Sys/GameSettings/GD7E70.ini

@@ -1,17 +1,11 @@
 # GD7E70 - Dragon Ball Z: Budokai
 
-[Core]
-# Values set here will override the main Dolphin settings.
-
 [OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Gecko]
 $Deinterlacing Fix
-003CB228 00000000
+0x803cb228:byte:0x00000000
 
-[Gecko_RetroAchievements_Verified]
+[OnFrame_Enabled]
+$Deinterlacing Fix
+
+[Patches_RetroAchievements_Verified]
 $Deinterlacing Fix

Data/Sys/GameSettings/GD7PB2.ini

@@ -1,17 +1,11 @@
 # GD7PB2 - Dragon Ball Z: Budokai
 
-[Core]
-# Values set here will override the main Dolphin settings.
-
 [OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Gecko]
 $Deinterlacing Fix
-0044E9A8 00000000
+0x8044e9a8:byte:0x00000000
 
-[Gecko_RetroAchievements_Verified]
+[OnFrame_Enabled]
+$Deinterlacing Fix
+
+[Patches_RetroAchievements_Verified]
 $Deinterlacing Fix

Data/Sys/GameSettings/GDD.ini

@@ -12,4 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids stuck black screens during FMVs.
 ImmediateXFBEnable = False

Data/Sys/GameSettings/GDG.ini

@@ -1,4 +1,4 @@
-# GDGE7H, GDGP78 - Dragon's Lair 3D
+# GDGE7H, GDGP78 - Dragon's Lair 3D: Return to the Lair
 
 [Core]
 # Values set here will override the main Dolphin settings.
@@ -12,5 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids stuck screens during FMVs.
 ImmediateXFBEnable = False
-

Data/Sys/GameSettings/GDJ.ini

@@ -0,0 +1,5 @@
+# GDJEB2, GDJJB2 - Digimon World 4
+
+[Video_Hacks]
+# Avoids constant black flickering.
+ImmediateXFBEnable = False

Data/Sys/GameSettings/GDS.ini

@@ -1,16 +1,5 @@
 # GDSE78, GDSP78 - Dark Summit
 
-[Core]
-# Values set here will override the main Dolphin settings.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video_Settings]
-
 [Video_Hacks]
+# Avoids stuck screens during FMVs.
 ImmediateXFBEnable = False
-

Data/Sys/GameSettings/GDSE78.ini

@@ -0,0 +1,8 @@
+# GDSE78 - Dark Summit
+
+[OnFrame]
+$Limit internal frame rate (speed hack)
+0x80088784:dword:0x48184278
+
+[OnFrame_Enabled]
+$Limit internal frame rate (speed hack)

Data/Sys/GameSettings/GDSP78.ini

@@ -0,0 +1,8 @@
+# GDSP78 - Dark Summit
+
+[OnFrame]
+$Limit internal frame rate (speed hack)
+0x80089808:dword:0x481818A0
+
+[OnFrame_Enabled]
+$Limit internal frame rate (speed hack)

Data/Sys/GameSettings/GDT.ini

@@ -1,4 +1,4 @@
-# GDTE69, GDTP69 - Def Jam VENDETTA
+# GDTE69, GDTP69 - Def Jam Vendetta
 
 [Core]
 # Values set here will override the main Dolphin settings.
@@ -12,4 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids stuck black screens during FMVs.
 ImmediateXFBEnable = False

Data/Sys/GameSettings/GE3.ini

@@ -13,4 +13,5 @@
 SafeTextureCacheColorSamples = 0
 
 [Video_Hacks]
+# Intro FMVs are uncapped and slow to emulate.
 ImmediateXFBEnable = False

Data/Sys/GameSettings/GE4.ini

@@ -2,11 +2,17 @@
 
 [Core]
 # Values set here will override the main Dolphin settings.
+# The game has an uncapped frame rate, which is equivalent to SyncOnSkipIdle already being False.
+# Setting it is meant to avoid any performance regression when using the frame rate limit patch.
 SyncOnSkipIdle = False
 
 [OnFrame]
-# Add memory patches to be applied every frame here.
+# `nop` a branch that skips a call to `VIWaitForRetrace`.
+$Limit internal FPS to VPS (improves performance)
+0x80013818:dword:0x60000000
 
 [ActionReplay]
 # Add action replay cheats here.
 
+[OnFrame_Enabled]
+$Limit internal FPS to VPS (improves performance)

Data/Sys/GameSettings/GE9.ini

@@ -1,4 +1,4 @@
-# GE9E5D - Ed, Edd n Eddy
+# GE9E5D - Ed, Edd n Eddy: The Mis-Edventures
 
 [Core]
 # Values set here will override the main Dolphin settings.
@@ -16,3 +16,6 @@ HLE_BS2 = True
 [Video_Settings]
 SafeTextureCacheColorSamples = 512
 
+[Video_Hacks]
+# Avoids shifted screen.
+ImmediateXFBEnable = False

Data/Sys/GameSettings/GEO.ini

@@ -1,4 +1,4 @@
-# GEOE08, GEOP08 - CAPCOM VS. SNK 2  EO
+# GEOE08, GEOP08 - Capcom vs. SNK 2 EO
 
 [Core]
 # Values set here will override the main Dolphin settings.
@@ -13,4 +13,5 @@
 SafeTextureCacheColorSamples = 512
 
 [Video_Hacks]
+# Avoids subtle flickering in menu and severe flickering in game.
 ImmediateXFBEnable = False

Data/Sys/GameSettings/GEYJ6E.ini

@@ -0,0 +1,4 @@
+# GEYJ6E - Virtua Striker 2002 (Japan)
+
+[Core]
+FPRF = True

Data/Sys/GameSettings/GEYP6E.ini

@@ -0,0 +1,4 @@
+# GEYP6E - Virtua Striker 2002 (Export, Type3)
+
+[Core]
+FPRF = True

Data/Sys/GameSettings/GF4.ini

@@ -12,5 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids extraneous frames with terrible pacing and flickering in the UI.
 ImmediateXFBEnable = False
-

Data/Sys/GameSettings/GFD.ini

@@ -12,5 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids shifted display and constant black flickering.
 ImmediateXFBEnable = False
-

Data/Sys/GameSettings/GFG.ini

@@ -12,4 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids stuck black screens during FMVs.
 ImmediateXFBEnable = False

Data/Sys/GameSettings/GGE.ini

@@ -14,4 +14,5 @@
 [Video_Hacks]
 
 [Video_Hacks]
+# Avoids extraneous frames with terrible pacing.
 ImmediateXFBEnable = False

Data/Sys/GameSettings/GGGE6E.ini

@@ -0,0 +1,5 @@
+# GGGE6E - F-ZERO AX
+
+[Core]
+FPRF = True
+

Data/Sys/GameSettings/GGN.ini

@@ -1,4 +1,4 @@
-# GGNE5D - The Grim Adventures of Billy & Mandy
+# GGNE5D - The Grim Adventures of Billy & Mandy (GC)
 
 [Core]
 # Values set here will override the main Dolphin settings.
@@ -12,4 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids stuck black screens during FMVs.
 ImmediateXFBEnable = False

Data/Sys/GameSettings/GGR.ini

@@ -1,4 +1,4 @@
-# GGRE41 - TOM CLANCY'S GHOST RECON
+# GGRE41, GGRP41, GGRD41 - Tom Clancy's Ghost Recon (GC)
 
 [Core]
 # Values set here will override the main Dolphin settings.
@@ -12,5 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids stuck black screens during FMVs.
 ImmediateXFBEnable = False
-

Data/Sys/GameSettings/GGY.ini

@@ -1,4 +1,4 @@
-# GGYE41, GGYP41 - GR2GC
+# GGYE41, GGYP41 - Tom Clancy's Ghost Recon 2
 
 [Core]
 # Values set here will override the main Dolphin settings.
@@ -13,5 +13,5 @@
 SafeTextureCacheColorSamples = 512
 
 [Video_Hacks]
+# Avoids stuck black screens during FMVs.
 ImmediateXFBEnable = False
-

Data/Sys/GameSettings/GH2.ini

@@ -1,4 +1,4 @@
-# GH2E69, GH2P69 - NFS: HP2
+# GH2E69, GH2P69 - Need for Speed: Hot Pursuit 2
 
 [Core]
 # Values set here will override the main Dolphin settings.
@@ -12,5 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Game runs uncapped and is slow to emulate.
 ImmediateXFBEnable = False
-

Data/Sys/GameSettings/GHAE6E.ini

@@ -0,0 +1,5 @@
+# GHAE6E - F-ZERO AX (Monster)
+
+[Core]
+FPRF = True
+

Data/Sys/GameSettings/GHN.ini

@@ -12,4 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids stuck screeens before title screen.
 ImmediateXFBEnable = False

Data/Sys/GameSettings/GHS.ini

@@ -1,4 +1,4 @@
-# GHSE69, GHSJ69, GHSP69, GHSX69, GHSY69 - Harry Potter COS
+# GHSE69, GHSJ69, GHSP69, GHSX69, GHSY69 - Harry Potter and the Chamber of Secrets
 
 [Core]
 # Values set here will override the main Dolphin settings.
@@ -12,5 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids stuck FMVs and flickering throughout the entire game.
 ImmediateXFBEnable = False
-

Data/Sys/GameSettings/GHY.ini

@@ -1,4 +1,4 @@
-# GHYE6S - HauntedMansion
+# GHYE6S - The Haunted Mansion
 
 [Core]
 # Values set here will override the main Dolphin settings.
@@ -12,4 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids stuck screens during FMVs.
 ImmediateXFBEnable = False

Data/Sys/GameSettings/GHZW6E.ini

@@ -0,0 +1,4 @@
+# GHZW6E - VIRTUA STRIKER 4 (Asia)
+
+[Core]
+FPRF = True

Data/Sys/GameSettings/GIZ.ini

@@ -1,4 +1,4 @@
-# GIZE52 - TY the Tasmanian Tiger 3: Night of the Quinkan
+# GIZE52 - Ty the Tasmanian Tiger 3: Night of the Quinkan
 
 [Core]
 # Values set here will override the main Dolphin settings.
@@ -13,6 +13,7 @@
 SafeTextureCacheColorSamples = 512
 
 [Video_Hacks]
+# Avoids shifted screen.
 ImmediateXFBEnable = False
 # Fixes missing splash logo at boot.
 EFBAccessEnable = True

Data/Sys/GameSettings/GJAP6E.ini

@@ -0,0 +1,4 @@
+# GJAP6E - VIRTUA STRIKER 4 (Export)
+
+[Core]
+FPRF = True

Data/Sys/GameSettings/GJB.ini

@@ -13,5 +13,6 @@
 SafeTextureCacheColorSamples = 512
 
 [Video_Hacks]
+# Avoids stuck black screens during FMVs.
 ImmediateXFBEnable = False
 

Data/Sys/GameSettings/GJD.ini

@@ -1,4 +1,5 @@
 # GJDX7D, GJDE5S, GJDY7D - Judge Dredd: Dredd vs. Death
 
 [Video_Hacks]
+# Avoids stuck black screens during FMVs.
 ImmediateXFBEnable = False

Data/Sys/GameSettings/GJF.ini

@@ -13,6 +13,7 @@
 SafeTextureCacheColorSamples = 512
 
 [Video_Hacks]
+# Avoids shifted screen.
 ImmediateXFBEnable = False
 # Fixes missing splash logo at boot.
 EFBAccessEnable = True

Data/Sys/GameSettings/GJU.ini

@@ -0,0 +1,5 @@
+# GJUF78, GJUE78, GJUD78, GJUP78 - Tak and the Power of Juju
+
+[Video_Hacks]
+# Avoids constant black flickering.
+ImmediateXFBEnable = False

Data/Sys/GameSettings/GKH.ini

@@ -10,6 +10,7 @@
 # Add action replay cheats here.
 
 [Video_Hacks]
+# Avoids shifted screen.
 ImmediateXFBEnable = False
 # Fixes missing splash logo at boot.
 EFBAccessEnable = True

Data/Sys/GameSettings/GKS.ini

@@ -12,4 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids stuck black screens during FMVs.
 ImmediateXFBEnable = False

Data/Sys/GameSettings/GKZ.ini

@@ -1,4 +1,4 @@
-# GKZD9G, GKZE9G, GKZF9G, GKZP54, GKZP9G - Codename: Kids Next Door
+# GKZD9G, GKZE9G, GKZF9G, GKZP54, GKZP9G - Codename: Kids Next Door - Operation: V.I.D.E.O.G.A.M.E.
 
 [Core]
 # Values set here will override the main Dolphin settings.
@@ -12,4 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids stuck black screens during FMVs.
 ImmediateXFBEnable = False

Data/Sys/GameSettings/GLKJ6E.ini

@@ -0,0 +1,4 @@
+# GLKJ6E - VIRTUA STRIKER 4 Ver.2006 (Japan)
+
+[Core]
+FPRF = True

Data/Sys/GameSettings/GLLP6E.ini

@@ -0,0 +1,4 @@
+# GLLP6E - VIRTUA STRIKER 4 Ver.2006 (Export)
+
+[Core]
+FPRF = True

Data/Sys/GameSettings/GLR.ini

@@ -16,5 +16,6 @@ MMU = True
 
 [Video_Hacks]
 EFBToTextureEnable = False
+# Avoids majorly corrupted graphics in menus.
 ImmediateXFBEnable = False
 DeferEFBCopies = False

Data/Sys/GameSettings/GLS.ini

@@ -13,4 +13,5 @@ CPUThread = False
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids stuck black screens during FMVs.
 ImmediateXFBEnable = False

Data/Sys/GameSettings/GM3.ini

@@ -12,4 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids stuck black screens during FMVs and flickering in menus.
 ImmediateXFBEnable = False

Data/Sys/GameSettings/GMD.ini

@@ -12,4 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids stuck periwinkle screens during FMVs and flickering in menus.
 ImmediateXFBEnable = False

Data/Sys/GameSettings/GMK.ini

@@ -0,0 +1,5 @@
+# GMKE5D, GMKP5D, GMKD5D - Mortal Kombat: Deadly Alliance
+
+[Video_Hacks]
+# Avoids stuck black screens during FMVs.
+ImmediateXFBEnable = False

Data/Sys/GameSettings/GMSE01.ini

@@ -92,8 +92,9 @@ $D-Pad Left For Normal Mario
 4240E12C 4DE63F80
 4240E12C 4DE83F80
 00000000 40000000
+
 [Gecko]
-$Improved Jesus Mode  A.K.A Walk on Water DPad Up/Down = On/Off
+$Improved Jesus Mode A.K.A Walk on Water DPad Up/Down = On/Off [gamemasterplc]
 28404454 FFF70008
 C224F134 0000000A
 A8030000 2C000101
@@ -110,11 +111,11 @@ E2000001 80008000
 28404454 FFFB0004
 0424F134 A0630000
 E2000001 80008000
-$Infinite Water
+$Infinite Water [gamemasterplc]
 C2141DD8 00000002
 3B002710 93131C80
 60000000 00000000
-$Widescreen
+$Widescreen [gamemasterplc]
 04416758 44480000
 044123E8 442F0000
 04416620 442F0000

Data/Sys/GameSettings/GMX.ini

@@ -15,4 +15,5 @@ EFBToTextureEnable = False
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids stuck black screens during FMVs.
 ImmediateXFBEnable = False

Data/Sys/GameSettings/GNE.ini

@@ -12,4 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids stuck black screens during FMVs.
 ImmediateXFBEnable = False

Data/Sys/GameSettings/GO2.ini

@@ -14,4 +14,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids stuck screens before the title screen.
 ImmediateXFBEnable = False

Data/Sys/GameSettings/GOF.ini

@@ -0,0 +1,5 @@
+# GOFE7L, GOFP6S - Outlaw Golf
+
+[Video_Hacks]
+# Avoids stuck black FMVs and loading screens.
+ImmediateXFBEnable = False

Data/Sys/GameSettings/GP2.ini

@@ -12,5 +12,6 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids stuck black screens during FMVs.
 ImmediateXFBEnable = False
 

Data/Sys/GameSettings/GPK.ini

@@ -1,4 +1,4 @@
-# GPKE41 - DISNEY'S PK: OUT OF THE SHADOWS
+# GPKE41, GDOP41 - Disney's PK: Out of the Shadows
 
 [Core]
 # Values set here will override the main Dolphin settings.
@@ -12,5 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids stuck black screens during FMVs.
 ImmediateXFBEnable = False
-