2606 merge

.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

.github/workflows/ci.yml

@@ -52,9 +52,9 @@ jobs:
           HOMEBREW_NO_ANALYTICS: 1
         run: |
           brew install gnu-sed
-          if ! brew install ccache ninja; then
+          if ! brew install ccache ninja libspng; then
             brew update
-            brew install ccache ninja
+            brew install ccache ninja libspng
           fi
 
       - name: Cache Dependencies

.gitignore

@@ -43,3 +43,6 @@ CMakeLists.txt.user
 /.vscode/
 # Ignore flatpak-builder's cache dir
 .flatpak-builder
+
+# clangd cache for Neovim
+.cache/clangd

.gitmodules

@@ -129,3 +129,7 @@
 	path = Externals/imgui/imgui
 	url = https://github.com/ocornut/imgui.git
 	shallow = true
+[submodule "Externals/wil"]
+	path = Externals/wil
+	url = https://github.com/microsoft/wil.git
+	shallow = 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/DolphinLibraryTools.cmake

@@ -50,6 +50,17 @@ function(dolphin_add_bundled_library library use_system bundled_path)
   add_subdirectory(${bundled_path} EXCLUDE_FROM_ALL)
 endfunction()
 
+function(dolphin_set_library_type library type)
+  if(DEFINED ${library}_TYPE AND NOT ${${library}_TYPE} STREQUAL "${type}")
+    message(FATAL_ERROR
+      "The selection for ${library} changed from '${${library}_TYPE}' to '${type}' after configuration.\n"
+      "Please delete the build directory (or at least CMakeCache.txt) and reconfigure."
+    )
+  endif()
+
+  set(${library}_TYPE "${type}" CACHE INTERNAL "")
+endfunction()
+
 function(dolphin_find_optional_system_library library bundled_path)
   dolphin_optional_system_library(use_system ${library})
   string(TOUPPER ${library} upperlib)
@@ -101,11 +112,11 @@ function(dolphin_find_optional_system_library library bundled_path)
     endif()
   endif()
   if(${prefix}_FOUND)
+    dolphin_set_library_type(${library} "System")
     message(STATUS "Using system ${library}")
-    set(${prefix}_TYPE "System" PARENT_SCOPE)
   else()
+    dolphin_set_library_type(${library} "Bundled")
     dolphin_add_bundled_library(${library} ${use_system} ${bundled_path})
-    set(${prefix}_TYPE "Bundled" PARENT_SCOPE)
   endif()
 endfunction()
 
@@ -119,11 +130,11 @@ function(dolphin_find_optional_system_library_pkgconfig library search alias bun
     endif()
   endif()
   if(${library}_FOUND)
+    dolphin_set_library_type(${library} "System")
     message(STATUS "Using system ${library}")
     dolphin_alias_library(${alias} PkgConfig::${library})
-    set(${library}_TYPE "System" PARENT_SCOPE)
   else()
+    dolphin_set_library_type(${library} "Bundled")
     dolphin_add_bundled_library(${library} ${use_system} ${bundled_path})
-    set(${library}_TYPE "Bundled" PARENT_SCOPE)
   endif()
 endfunction()

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)