2609 merge

.github/workflows/ci.yml

@@ -17,16 +17,13 @@ jobs:
       uses: actions/checkout@v2
       with:
         repository: Project-Plus-Development-Team/Project-Plus-Dolphin
-        ref: master
         fetch-depth: 0
     - name: Setup Submodules
       run: git config --global --add safe.directory . && git submodule update --init --recursive
-    - name: Setup MSBuild
-      uses: microsoft/setup-msbuild@v1.0.2
-      with:
-        vs-version: '16.6.2'
+    - name: Configure CMake
+      run: cmake -S . -B build -A x64 "-DCMAKE_TOOLCHAIN_FILE=CMake/DolphinToolchain.cmake" -DARCH=x86_64
     - name: Build
-      run: msbuild "Source\dolphin-emu.sln" /verbosity:minimal /property:Configuration=Release /property:Platform=x64
+      run: cmake --build build --config Release --parallel
     - name: Upload Build Artifact
       uses: actions/upload-artifact@v4
       with:

.gitignore

@@ -46,3 +46,5 @@ CMakeLists.txt.user
 
 # clangd cache for Neovim
 .cache/clangd
+# Ignore CMake user presets
+CMakeUserPresets.json

.gitmodules

@@ -90,6 +90,10 @@
 	path = Externals/Vulkan-Headers
 	url = https://github.com/KhronosGroup/Vulkan-Headers.git
 	shallow = true
+[submodule "Externals/watcher/watcher"]
+	path = Externals/watcher/watcher
+	url = https://github.com/e-dant/watcher.git
+	shallow = true
 [submodule "Externals/SFML/SFML"]
 	path = Externals/SFML/SFML
 	url = https://github.com/SFML/SFML.git
@@ -98,9 +102,6 @@
 	path = Externals/zstd/zstd
 	url = https://github.com/facebook/zstd.git
 	shallow = true
-[submodule "Externals/watcher/watcher"]
-	path = Externals/watcher/watcher
-	url = https://github.com/e-dant/watcher.git
 [submodule "Externals/miniupnpc/miniupnp"]
 	path = Externals/miniupnpc/miniupnp
 	url = https://github.com/miniupnp/miniupnp.git

CMake/DolphinLibraryTools.cmake

@@ -1,3 +1,6 @@
+include(CheckCXXSourceCompiles)
+include(CheckCXXSymbolExists)
+
 # like add_library(new ALIAS old) but avoids add_library cannot create ALIAS target "new" because target "old" is imported but not globally visible. on older cmake
 # This can be replaced with a direct alias call once our minimum is cmake 3.18
 function(dolphin_alias_library new old)
@@ -138,3 +141,31 @@ function(dolphin_find_optional_system_library_pkgconfig library search alias bun
     dolphin_add_bundled_library(${library} ${use_system} ${bundled_path})
   endif()
 endfunction()
+
+function(dolphin_check_toolset_version LABEL VERSION_VAR MIN_VERSION)
+    if(NOT DEFINED ${VERSION_VAR})
+      return()
+    endif()
+    message(STATUS "Using ${LABEL} ${${VERSION_VAR}}")
+    if(${VERSION_VAR} VERSION_LESS ${MIN_VERSION})
+        message(FATAL_ERROR "Requires ${LABEL} ${MIN_VERSION} or higher")
+    endif()
+endfunction()
+
+
+function(dolphin_check_std_version LABEL VERSION_MACRO MIN_VERSION)
+  check_cxx_symbol_exists(${VERSION_MACRO} version IS_${LABEL})
+  if(NOT IS_${LABEL})
+    return()
+  endif()
+  check_cxx_source_compiles([[
+    #include <version>
+    #if ${VERSION_MACRO} < ${MIN_VERSION}
+    #error
+    #endif
+    int main(){}
+  ]] HAS_MINIMUM_${LABEL})
+  if(NOT HAS_MINIMUM_${LABEL})
+    message(FATAL_ERROR "Requires ${LABEL} ${MIN_VERSION} or higher")
+  endif()
+endfunction()

CMake/DolphinSymlinkOrCopy.cmake

@@ -0,0 +1,20 @@
+if(NOT DEFINED target OR NOT DEFINED link)
+    message(FATAL_ERROR "`target` and `link` must be defined")
+endif()
+
+file(CREATE_LINK "${target}" "${link}" RESULT result SYMBOLIC)
+if(result EQUAL 0)
+  return()
+endif()
+
+if(WIN32)
+  set(hint "On Windows, enable Developer Mode to allow symlinks (https://learn.microsoft.com/windows/advanced-settings/developer-mode).")
+endif()
+message(WARNING "Symlink failed (${result}). Falling back to copying. ${hint}")
+
+file(REMOVE_RECURSE "${link}")
+if(IS_DIRECTORY "${target}")
+    file(COPY "${target}/." DESTINATION "${link}")
+else()
+    file(COPY_FILE "${target}" "${link}" ONLY_IF_DIFFERENT)
+endif()

CMake/DolphinToolchain.cmake

@@ -0,0 +1,50 @@
+set(ARCH "generic" CACHE STRING "Target architecture")
+
+set(VALID_ARCHS x86_64 arm64 generic)
+if(NOT ARCH IN_LIST VALID_ARCHS)
+    message(FATAL_ERROR "Invalid ARCH='${ARCH}'. Valid: ${VALID_ARCHS}")
+endif()
+
+if(ARCH STREQUAL "generic")
+    set(ENABLE_GENERIC "ON")
+else()
+    set(CMAKE_SYSTEM_PROCESSOR "${ARCH}")
+endif()
+
+if (NOT DEFINED CMAKE_SYSTEM_NAME)
+    if(EXISTS "${CMAKE_SYSROOT}/usr/include/linux")
+        set(CMAKE_SYSTEM_NAME Linux)
+    elseif(EXISTS "${CMAKE_SYSROOT}/Windows/System32")
+        set(CMAKE_SYSTEM_NAME Windows)
+    elseif(EXISTS "${CMAKE_SYSROOT}/System/Library")
+        set(CMAKE_SYSTEM_NAME Darwin)
+    elseif(EXISTS "${CMAKE_SYSROOT}/usr/include/osreldate.h")
+        set(CMAKE_SYSTEM_NAME FreeBSD)
+    elseif(EXISTS "${CMAKE_SYSROOT}/usr/include/c++/v1/__locale_dir/locale_base_api/openbsd.h")
+        set(CMAKE_SYSTEM_NAME OpenBSD)
+    elseif(EXISTS "${CMAKE_SYSROOT}/usr/include/dev/dm/netbsd-dm.h")
+        set(CMAKE_SYSTEM_NAME NetBSD)
+    elseif(EXISTS "${CMAKE_SYSROOT}/boot/system/develop")
+        set(CMAKE_SYSTEM_NAME Haiku)
+    else()
+        message(WARNING "Cannot detect OS from sysroot '${CMAKE_SYSROOT}/'. Cross-compilation has been disabled.")
+    endif()
+endif()
+
+set(CMAKE_FIND_ROOT_PATH "${CMAKE_SYSROOT}")
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
+
+if(NOT QT_HOST_PATH)
+    if(${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Windows")
+        if (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "AMD64")
+            set(QT_HOST_PATH "${CMAKE_SOURCE_DIR}/Externals/Qt/Qt6.8.3/x64")
+        else()
+            set(QT_HOST_PATH "${CMAKE_SOURCE_DIR}/Externals/Qt/Qt6.8.3/ARM64")
+        endif()
+    else()
+        set(QT_HOST_PATH "/usr")
+    endif()
+endif()

CMake/GenerateAchievementHash.cmake

@@ -0,0 +1,5 @@
+# This file exists to be consumed via `add_custom_command`
+# so that file changes are picked up without needing a full reconfigure
+
+file(SHA1 ${JSON_FILE} ACHIEVEMENT_APPROVED_LIST_HASH)
+configure_file(${TEMPLATE_FILE} ${OUTPUT_FILE} @ONLY)

CMake/ScmRevGen.cmake

@@ -33,8 +33,8 @@ endif()
 string(TIMESTAMP DOLPHIN_WC_BUILD_DATE "%Y-%m-%d" UTC)
 
 # version number
-set(DOLPHIN_VERSION_MAJOR "v3.2.0")
-set(DOLPHIN_VERSION_MINOR "2606a")
+set(DOLPHIN_VERSION_MAJOR "v3.2.1")
+set(DOLPHIN_VERSION_MINOR "0")
 set(DOLPHIN_VERSION_PATCH ${DOLPHIN_WC_REVISION})
 
 # If Dolphin is not built from a Git repository, default the version info to