Merge pull request #419 from Detanup01/vs-26-and-clang

Update to VS26

Author: Detanup01

.github/workflows/emu-build-all-linux.yml

@@ -10,7 +10,7 @@ permissions:
   contents: "write"
 
 env:
-  PREMAKE_ACTION: "gmake2"
+  PREMAKE_ACTION: "gmake"
   DEPS_CACHE_KEY: "emu-deps-linux"
   DEPS_CACHE_DIR: "build/deps/linux"
 
@@ -29,7 +29,7 @@ jobs:
   builds-matrix-linux:
     name: "build"
     needs: ["deps"]
-    runs-on: "ubuntu-22.04"
+    runs-on: "ubuntu-24.04"
     if: ${{ !cancelled() }}
     continue-on-error: true
 
@@ -49,7 +49,7 @@ jobs:
             # tests
             "test_gamepad_linux",
           ]
-        arch: ["x64", "x32"]
+        arch: ["x64", "x86"]
         cfg: ["debug", "release"]
 
     steps:
@@ -91,7 +91,7 @@ jobs:
         working-directory: "${{ github.workspace }}"
         run: |
           sudo chmod 777 ./${{env.THIRD_PARTY_BASE_DIR}}/common/linux/premake/premake5
-          ./${{env.THIRD_PARTY_BASE_DIR}}/common/linux/premake/premake5 --file=premake5.lua --genproto --emubuild=${{ github.sha }} --os=linux gmake2
+          ./${{env.THIRD_PARTY_BASE_DIR}}/common/linux/premake/premake5 --file=premake5.lua --genproto --emubuild=${{ github.sha }} --os=linux gmake
 
       # mandatory Linux packages
       - name: "Install required packages"
@@ -112,7 +112,7 @@ jobs:
       # build target
       - name: "Build target"
         shell: "bash"
-        working-directory: "${{ github.workspace }}/build/project/gmake2/linux"
+        working-directory: "${{ github.workspace }}/build/project/gmake/linux"
         run: |
           echo "dry run..."
           make -n -j ${{ env.MAX_PARALLEL_JOBS }} config=${{ matrix.cfg }}_${{ matrix.arch }} ${{ matrix.prj }}

.github/workflows/emu-build-all-win.yml

@@ -10,7 +10,7 @@ permissions:
   contents: "write"
 
 env:
-  PREMAKE_ACTION: "vs2022"
+  PREMAKE_ACTION: "vs2026"
   DEPS_CACHE_KEY: "emu-deps-win"
   DEPS_CACHE_DIR: "build/deps/win"
 
@@ -28,7 +28,7 @@ jobs:
   builds-matrix-win:
     name: "build"
     needs: ["deps"]
-    runs-on: "windows-2022"
+    runs-on: "windows-2025-vs2026"
     if: ${{ !cancelled() }}
     continue-on-error: true
 
@@ -103,14 +103,14 @@ jobs:
         shell: "cmd"
         working-directory: "${{ github.workspace }}"
         run: |
-          "${{env.THIRD_PARTY_BASE_DIR}}\common\win\premake\premake5.exe" --file=premake5.lua --genproto --emubuild=${{ github.sha }} --dosstub --winrsrc --winsign --os=windows vs2022
+          "${{env.THIRD_PARTY_BASE_DIR}}\common\win\premake\premake5.exe" --file=premake5.lua --genproto --emubuild=${{ github.sha }} --dosstub --winrsrc --winsign --os=windows vs2026
 
       # build target
       - name: "Build target"
         shell: "cmd"
-        working-directory: "${{ github.workspace }}/build/project/vs2022/win"
+        working-directory: "${{ github.workspace }}/build/project/vs2026/win"
         run: |
-          msbuild /nologo /target:${{ matrix.prj }} /m:1 -p:CL_MPCount=${{ env.MAX_PARALLEL_JOBS }} /v:n /p:Configuration=${{ matrix.cfg }},Platform=${{ matrix.arch }} gbe.sln
+          msbuild /nologo /target:${{ matrix.prj }} /m:1 -p:CL_MPCount=${{ env.MAX_PARALLEL_JOBS }} /v:n /p:Configuration=${{ matrix.cfg }},Platform=${{ matrix.arch }} gbe.slnx
 
       # upload artifact/package to github Actions
       - name: "Upload target package"

.github/workflows/emu-deps-linux.yml

@@ -10,7 +10,7 @@ permissions:
   contents: "write"
 
 env:
-  PREMAKE_ACTION: "gmake2"
+  PREMAKE_ACTION: "gmake"
   DEPS_CACHE_KEY: "emu-deps-linux"
   DEPS_CACHE_DIR: "build/deps/linux"
 
@@ -22,7 +22,7 @@ env:
 
 jobs:
   deps-build:
-    runs-on: "ubuntu-22.04"
+    runs-on: "ubuntu-24.04"
     if: ${{ !cancelled() }}
 
     steps:
@@ -90,4 +90,4 @@ jobs:
         run: |
           export CMAKE_GENERATOR="Unix Makefiles"
           sudo chmod 777 ./${{env.THIRD_PARTY_BASE_DIR}}/common/linux/premake/premake5
-          ./${{env.THIRD_PARTY_BASE_DIR}}/common/linux/premake/premake5 --file=premake5-deps.lua --64-build --32-build --all-ext --all-build --j=${{ env.MAX_PARALLEL_JOBS }} --verbose --clean --os=linux gmake2
+          ./${{env.THIRD_PARTY_BASE_DIR}}/common/linux/premake/premake5 --file=premake5-deps.lua --64-build --32-build --all-ext --all-build --j=${{ env.MAX_PARALLEL_JOBS }} --verbose --clean --os=linux gmake

.github/workflows/emu-deps-win.yml

@@ -10,7 +10,7 @@ permissions:
   contents: "write"
 
 env:
-  PREMAKE_ACTION: "vs2022"
+  PREMAKE_ACTION: "vs2026"
   DEPS_CACHE_KEY: "emu-deps-win"
   DEPS_CACHE_DIR: "build/deps/win"
 
@@ -22,7 +22,7 @@ env:
 
 jobs:
   deps-build:
-    runs-on: "windows-2022"
+    runs-on: "windows-2025-vs2026"
     if: ${{ !cancelled() }}
 
     steps:
@@ -69,17 +69,10 @@ jobs:
           ref: "third-party/deps/common"
           path: "${{env.THIRD_PARTY_BASE_DIR}}/deps/common"
 
-      - name: "Clone third-party deps (common/win)"
-        if: steps.emu-deps-cache-step.outputs.cache-hit != 'true'
-        uses: actions/checkout@v6
-        with:
-          ref: "third-party/common/win"
-          path: "${{env.THIRD_PARTY_BASE_DIR}}/common/win"
-
       - name: "Build deps"
         if: steps.emu-deps-cache-step.outputs.cache-hit != 'true'
         shell: "cmd"
         working-directory: "${{ github.workspace }}"
         run: |
-          set "CMAKE_GENERATOR=Visual Studio 17 2022"
-          "${{env.THIRD_PARTY_BASE_DIR}}\common\win\premake\premake5.exe" --file=premake5-deps.lua --64-build --32-build --all-ext --all-build --j=${{ env.MAX_PARALLEL_JOBS }} --verbose --clean --os=windows vs2022
+          set "CMAKE_GENERATOR=Visual Studio 18 2026"
+          "${{env.THIRD_PARTY_BASE_DIR}}\common\win\premake\premake5.exe" --file=premake5-deps.lua --64-build --32-build --all-ext --all-build --j=${{ env.MAX_PARALLEL_JOBS }} --verbose --clean --os=windows vs2026

.github/workflows/migrate_gse-build-linux.yml

@@ -16,7 +16,7 @@ env:
 
 jobs:
   build:
-    runs-on: "ubuntu-22.04"
+    runs-on: "ubuntu-24.04"
 
     steps:
       - name: "Checkout branch"

.github/workflows/migrate_gse-build-win.yml

@@ -18,7 +18,7 @@ env:
 
 jobs:
   build:
-    runs-on: "windows-2022"
+    runs-on: "windows-2025-vs2026"
 
     steps:
       - name: "Set up Python 3.12"

.github/workflows/release.yml

@@ -21,7 +21,7 @@ jobs:
 
   emu-win-prep:
     needs: ["emu-win-all"]
-    runs-on: "windows-2022"
+    runs-on: "windows-2025-vs2026"
     steps:
       # on Windows Git will auto change line ending to CRLF, not preferable
       - name: "Ensure LF line ending"
@@ -61,13 +61,13 @@ jobs:
       - name: "Package build (release)"
         shell: "cmd"
         working-directory: "${{ github.workspace }}"
-        run: package_win.bat vs2022\release
+        run: package_win.bat vs2026\release
 
       # package (debug mode)
       - name: "Package build (debug)"
         shell: "cmd"
         working-directory: "${{ github.workspace }}"
-        run: package_win.bat vs2022\debug 1
+        run: package_win.bat vs2026\debug 1
 
       # release (debug + release modes) if this is a tag push
       - name: "Release"
@@ -82,7 +82,7 @@ jobs:
         uses: actions/upload-artifact@v7
         with:
           name: "release-emu-win-release-${{ github.sha }}"
-          path: "build/package/win/vs2022/*release*"
+          path: "build/package/win/vs2026/*release*"
           if-no-files-found: "error"
           compression-level: 0
           retention-days: 7
@@ -92,7 +92,7 @@ jobs:
         uses: actions/upload-artifact@v7
         with:
           name: "release-emu-win-debug-${{ github.sha }}"
-          path: "build/package/win/vs2022/*debug*"
+          path: "build/package/win/vs2026/*debug*"
           if-no-files-found: "error"
           compression-level: 0
           retention-days: 7
@@ -104,7 +104,7 @@ jobs:
 
   emu-linux-prep:
     needs: ["emu-linux-all"]
-    runs-on: "ubuntu-22.04"
+    runs-on: "ubuntu-24.04"
     steps:
       # we need branch because it has package scripts
       - name: "Checkout branch"
@@ -150,13 +150,13 @@ jobs:
       - name: "Package build (release)"
         shell: "bash"
         working-directory: "${{ github.workspace }}"
-        run: ./package_linux.sh gmake2/release
+        run: ./package_linux.sh gmake/release
 
       # package (debug mode)
       - name: "Package build (debug)"
         shell: "bash"
         working-directory: "${{ github.workspace }}"
-        run: ./package_linux.sh gmake2/debug 1
+        run: ./package_linux.sh gmake/debug 1
 
       # release (debug + release modes) if this is a tag push
       - name: "Release"
@@ -171,7 +171,7 @@ jobs:
         uses: actions/upload-artifact@v7
         with:
           name: "release-emu-linux-release-${{ github.sha }}"
-          path: "build/package/linux/gmake2/*release*"
+          path: "build/package/linux/gmake/*release*"
           if-no-files-found: "error"
           compression-level: 0
           retention-days: 7
@@ -181,7 +181,7 @@ jobs:
         uses: actions/upload-artifact@v7
         with:
           name: "release-emu-linux-debug-${{ github.sha }}"
-          path: "build/package/linux/gmake2/*debug*"
+          path: "build/package/linux/gmake/*debug*"
           if-no-files-found: "error"
           compression-level: 0
           retention-days: 7
@@ -193,7 +193,7 @@ jobs:
 
   migrate_gse_script-win-prep:
     needs: ["migrate_gse_script-win"]
-    runs-on: "windows-2022"
+    runs-on: "windows-2025-vs2026"
     steps:
       # on Windows Git will auto change line ending to CRLF, not preferable
       - name: "Ensure LF line ending"
@@ -253,7 +253,7 @@ jobs:
 
   migrate_gse_script-linux-prep:
     needs: ["migrate_gse_script-linux"]
-    runs-on: "ubuntu-22.04"
+    runs-on: "ubuntu-24.04"
     steps:
       # we need branch because it has package scripts
       - name: "Checkout branch"

.gitmodules

@@ -11,12 +11,12 @@
 [submodule "third-party/common/win"]
   path = third-party/common/win
   url = ./
-  branch = third-party/common/win
+	branch = third-party/common/win
 
 [submodule "third-party/common/linux"]
   path = third-party/common/linux
   url = ./
-  branch = third-party/common/linux
+	branch = third-party/common/linux
 
 [submodule "third-party/deps/win"]
   path = third-party/deps/win
@@ -31,4 +31,4 @@
 [submodule "third-party/deps/common"]
   path = third-party/deps/common
   url = ./
-  branch = third-party/deps/common
+	branch = third-party/deps/common

README.md

@@ -144,8 +144,8 @@ The only times you'll need to rebuild them is either when their separete build f
 Open CMD in the repo folder, then run the following
 * To build using `Visual Studio`
   ```batch
-  set "CMAKE_GENERATOR=Visual Studio 17 2022"
-  third-party\common\win\premake\premake5.exe --file=premake5-deps.lua --64-build --32-build   --all-ext --all-build --verbose --os=windows vs2022
+  set "CMAKE_GENERATOR=Visual Studio 18 2026"
+  third-party\common\win\premake\premake5.exe --file=premake5-deps.lua --64-build --32-build   --all-ext --all-build --verbose --os=windows vs2026
   ```
 * To build using `MSYS2` **this is currently experimental and will not work due to ABI differences**  
   <details>
@@ -196,14 +196,14 @@ This will:
 Open CMD in the repo folder, then run the following
 * For `Visual Studio 2022`
   ```batch
-  third-party\common\win\premake\premake5.exe --file=premake5.lua --genproto --os=windows vs2022
+  third-party\common\win\premake\premake5.exe --file=premake5.lua --genproto --os=windows vs2026
   ```  
-  You can then go to the folder `build\project\vs2022\win` and open the produced `.sln` file in Visual Studio.  
-  Or, if you prefer to do it from command line, open the `Developer Command Prompt for VS 2022` inside the above folder, then:  
+  You can then go to the folder `build\project\vs2026\win` and open the produced `.sln` file in Visual Studio.  
+  Or, if you prefer to do it from command line, open the `Developer Command Prompt for VS 2026` inside the above folder, then:  
   ```batch
-  msbuild /nologo /v:n /p:Configuration=release,Platform=Win32 gbe.sln
+  msbuild /nologo /v:n /p:Configuration=release,Platform=Win32 gbe.slnx
 
-  msbuild /nologo /v:n /p:Configuration=release,Platform=x64 gbe.sln
+  msbuild /nologo /v:n /p:Configuration=release,Platform=x64 gbe.slnx
   ```
 
 * For `MSYS2` **this is currently experimental and will not work due to ABI differences**  
@@ -312,7 +312,7 @@ Open CMD in the repos's directory, then run this script
 ```batch
 package_win.bat <build_folder>
 ```
-`build_folder` is any folder inside `build\win`, for example: `vs2022\release`  
+`build_folder` is any folder inside `build\win`, for example: `vs2026\release`  
 The above example will create a `.7z` archive inside `build\package\win\`
 
 ### On Linux:

build_win_premake.bat

@@ -48,8 +48,8 @@ set /a "BUILD_JOBS=-1"
 
   :: build deps
   if %BUILD_DEPS% equ 1 (
-    set "CMAKE_GENERATOR=Visual Studio 17 2022"
-    call "%PREMAKE_EXE%" --file="premake5-deps.lua" --64-build --32-build --all-ext --all-build --j=2 --verbose --clean --os=windows vs2022 || (
+    set "CMAKE_GENERATOR=Visual Studio 18 2026"
+    call "%PREMAKE_EXE%" --file="premake5-deps.lua" --64-build --32-build --all-ext --all-build --j=2 --verbose --clean --os=windows vs2026 || (
       goto :end_script_with_err
     )
     goto :end_script
@@ -84,13 +84,13 @@ set /a "BUILD_JOBS=-1"
   if %GEN_PROJECT% equ 0 (
     goto :gen_project_end
   )
-  call "%PREMAKE_EXE%" --file="premake5.lua" --genproto --dosstub --winrsrc --winsign --os=windows vs2022 || (
+  call "%PREMAKE_EXE%" --file="premake5.lua" --genproto --dosstub --winrsrc --winsign --os=windows vs2026 || (
     goto :end_script_with_err
   )
 :gen_project_end
 
   :: check .sln
-  set "SLN_FILE=build\project\vs2022\win\gbe.sln"
+  set "SLN_FILE=build\project\vs2026\win\gbe.slnx"
   if not exist "%SLN_FILE%" (
     1>&2 echo:.sln file wasn't found
     goto :end_script_with_err