Merge pull request #11 - Upstream merge to 2509

Upstream merge to 2509

Author: Motobug

.github/workflows/ci.yml

@@ -3,6 +3,30 @@ name: Project+ Dolphin Builder
 on: [push, pull_request]
 
 jobs: 
+  build_windows_x86_64:
+    name: Windows Build
+    runs-on: windows-latest
+    steps:
+    - name: Checkout Repository
+      uses: actions/checkout@v2
+      with:
+        repository: Project-Plus-Development-Team/Project-Plus-Dolphin
+        ref: dolphin-emu-release-prep-2509
+        fetch-depth: 0
+    - name: Setup Submodules
+      run: git config --global --add safe.directory . && git submodule update --init --recursive
+    - name: Setup MSBuild
+      uses: microsoft/[email protected]
+      with:
+        vs-version: '16.6.2'
+    - name: Build
+      run: msbuild "Source\dolphin-emu.sln" /verbosity:minimal /property:Configuration=Release /property:Platform=x64
+    - name: Upload Build Artifact
+      uses: actions/upload-artifact@v4
+      with:
+        name: Project-Plus-Dolphin-windows-x86_64
+        path: Binary/x64/
+        
   build_macos:
     name: macOS Build
     runs-on: macos-14
@@ -17,7 +41,10 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@v4
         with:
+          repository: Project-Plus-Development-Team/Project-Plus-Dolphin
+          ref: dolphin-emu-release-prep-2509
           submodules: recursive
+          fetch-depth: 0
 
       - name: Install Packages
         env:
@@ -91,6 +118,7 @@ jobs:
             -DCMAKE_C_COMPILER_LAUNCHER=ccache
             -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
             -DCMAKE_DISABLE_PRECOMPILE_HEADERS=ON
+            -DCMAKE_POLICY_VERSION_MINIMUM=3.5
             -DUSE_SYSTEM_LIBS=OFF
             -DUSE_SYSTEM_BZIP2=ON
             -DUSE_SYSTEM_CURL=ON
@@ -112,13 +140,8 @@ jobs:
                 "${COMMON_ARGS[@]}" \
                 -B build-arm .
 
-      - name: Dolphin-Build Number
-        run: |
-          export LASTCOMMIT=$(git log --pretty=format:%H -1)
-          export DOLPHINVER="v3.1.2-mainline-beta.4"
-          echo "DOLPHIN Build $DOLPHINVER"
-          echo "DOLPHINVER=$DOLPHINVER" >> $GITHUB_ENV
-          gsed -i "s|\${DOLPHIN_WC_DESCRIBE}|$DOLPHINVER|g" Source/Core/Common/scmrev.h.in
+      - name: Purge .git for space reasons
+        run: rm -rf /home/runner/work/Project-Plus-Dolphin-src/.git
       - name: Build Dolphin (x86_64)
         working-directory: build
         run: |
@@ -168,25 +191,6 @@ jobs:
           name: ${{ steps.create-artifact.outputs.name }}
           path: "*.tar.xz"
 
-  build_windows_x86_64:
-    name: Windows Build
-    runs-on: windows-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Setup Submodules
-      run: git config --global --add safe.directory . && git submodule update --init --recursive
-    - name: Setup MSBuild
-      uses: microsoft/[email protected]
-      with:
-        vs-version: '16.6.2'
-    - name: Build
-      run: msbuild "Source\dolphin-emu.sln" /verbosity:minimal /property:Configuration=Release /property:Platform=x64
-    - name: Upload Build Artifact
-      uses: actions/upload-artifact@v4
-      with:
-        name: Project-Plus-Dolphin-windows-x86_64
-        path: Binary/x64/
-        
   build_flatpak:
     name: Flatpak Build
     runs-on: ubuntu-latest
@@ -218,7 +222,8 @@ jobs:
       uses: actions/checkout@v4
       with:
         repository: Project-Plus-Development-Team/Project-Plus-Dolphin
-        ref: master
+        ref: dolphin-emu-release-prep-2509
+        fetch-depth: 0
 
     - name: Checkout Submodules
       if: steps.cache-submodules.outputs.cache-hit != 'true'
@@ -259,13 +264,8 @@ jobs:
         libbz2-dev liblzo2-dev libxi-dev libavcodec-dev libudev-dev libusb-1.0-0-dev libevdev-dev libc6-dev libhidapi-dev libavformat-dev libavdevice-dev \
         libfmt-dev libwayland-dev libxrandr-dev libglu1-mesa-dev libcurl4-openssl-dev x11-utils zenity wget curl git gettext ccache make cmake ninja-build \
         libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-icccm4 libxcb-image0-dev libxcb-cursor-dev 
-    - name: Dolphin-Build Number
-      run: |
-        export LASTCOMMIT=$(git log --pretty=format:%H -1)
-        export DOLPHINVER="v3.1.2-mainline-beta.4"
-        echo "DOLPHIN Build $DOLPHINVER"
-        echo "DOLPHINVER=$DOLPHINVER" >> $GITHUB_ENV
-        sed -i "s|\${DOLPHIN_WC_DESCRIBE}|$DOLPHINVER|g" Source/Core/Common/scmrev.h.in
+    - name: Purge .git for space reasons
+      run: rm -rf /home/runner/work/Project-Plus-Dolphin-src/.git
     - name: Update Patchelf
       run: |
         PATCHELFVER=0.14.5

.gitmodules

@@ -1,32 +1,26 @@
 [submodule "Externals/Qt"]
 	path = Externals/Qt
 	url = https://github.com/dolphin-emu/ext-win-qt.git
-	branch = master
 	shallow = true
 [submodule "Externals/mGBA/mgba"]
 	path = Externals/mGBA/mgba
 	url = https://github.com/mgba-emu/mgba.git
-	branch = master
 	shallow = true
 [submodule "Externals/FFmpeg-bin"]
 	path = Externals/FFmpeg-bin
 	url = https://github.com/dolphin-emu/ext-win-ffmpeg.git
-	branch = master
 	shallow = true
 [submodule "libusb"]
 	path = Externals/libusb/libusb
 	url = https://github.com/libusb/libusb.git
-	branch = master
 	shallow = true
 [submodule "Externals/spirv_cross/SPIRV-Cross"]
 	path = Externals/spirv_cross/SPIRV-Cross
 	url = https://github.com/KhronosGroup/SPIRV-Cross.git
-	branch = main
 	shallow = true
 [submodule "SDL"]
 	path = Externals/SDL/SDL
 	url = https://github.com/libsdl-org/SDL.git
-	branch = SDL2
 	shallow = true
 [submodule "Externals/zlib-ng/zlib-ng"]
 	path = Externals/zlib-ng/zlib-ng
@@ -35,58 +29,78 @@
 [submodule "Externals/libspng/libspng"]
 	path = Externals/libspng/libspng
 	url = https://github.com/randy408/libspng.git
-	branch = v0.7.2
 	shallow = true
 [submodule "Externals/VulkanMemoryAllocator"]
 	path = Externals/VulkanMemoryAllocator
 	url = https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git
+	shallow = true
 [submodule "Externals/cubeb/cubeb"]
 	path = Externals/cubeb/cubeb
 	url = https://github.com/mozilla/cubeb.git
-	branch = master
 	shallow = true
 [submodule "Externals/implot/implot"]
 	path = Externals/implot/implot
 	url = https://github.com/epezent/implot.git
+	shallow = true
 [submodule "Externals/gtest"]
 	path = Externals/gtest
 	url = https://github.com/google/googletest.git
+	shallow = true
 [submodule "Externals/rcheevos/rcheevos"]
 	path = Externals/rcheevos/rcheevos
 	url = https://github.com/RetroAchievements/rcheevos.git
+	shallow = true
 [submodule "Externals/libadrenotools"]
 	path = Externals/libadrenotools
 	url = https://github.com/bylaws/libadrenotools.git
+	shallow = true
 [submodule "Externals/curl/curl"]
 	path = Externals/curl/curl
 	url = https://github.com/curl/curl.git
+	shallow = true
 [submodule "Externals/fmt/fmt"]
 	path = Externals/fmt/fmt
 	url = https://github.com/fmtlib/fmt.git
+	shallow = true
 [submodule "Externals/lz4/lz4"]
 	path = Externals/lz4/lz4
-	url = https://github.com/lz4/lz4
+	url = https://github.com/lz4/lz4.git
+	shallow = true
 [submodule "Externals/xxhash/xxHash"]
 	path = Externals/xxhash/xxHash
 	url = https://github.com/Cyan4973/xxHash.git
+	shallow = true
 [submodule "Externals/enet/enet"]
 	path = Externals/enet/enet
 	url = https://github.com/lsalzman/enet.git
+	shallow = true
 [submodule "hidapi-src"]
 	path = Externals/hidapi/hidapi-src
-	url = https://github.com/libusb/hidapi
+	url = https://github.com/libusb/hidapi.git
+	shallow = true
 [submodule "Externals/tinygltf/tinygltf"]
 	path = Externals/tinygltf/tinygltf
 	url = https://github.com/syoyo/tinygltf.git
+	shallow = true
 [submodule "Externals/minizip-ng/minizip-ng"]
 	path = Externals/minizip-ng/minizip-ng
-	url = https://github.com/zlib-ng/minizip-ng
+	url = https://github.com/zlib-ng/minizip-ng.git
+	shallow = true
 [submodule "Externals/Vulkan-Headers"]
 	path = Externals/Vulkan-Headers
 	url = https://github.com/KhronosGroup/Vulkan-Headers.git
+	shallow = true
 [submodule "Externals/SFML/SFML"]
 	path = Externals/SFML/SFML
 	url = https://github.com/SFML/SFML.git
+	shallow = true
 [submodule "Externals/zstd/zstd"]
 	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

CMakeLists.txt

@@ -786,6 +786,8 @@ if (USE_RETRO_ACHIEVEMENTS)
 	add_subdirectory(Externals/rcheevos)
 endif()
 
+add_subdirectory(Externals/watcher)
+
 ########################################
 # Pre-build events: Define configuration variables and write SCM info header
 #