Update workflows

.github/workflows/re3_msvc_amd64.yml

@@ -1,4 +1,4 @@
-name: reVC premake amd64 build
+name: re3 premake amd64 build
 
 on:
   workflow_dispatch:
@@ -11,7 +11,7 @@ env:
 
 jobs:
   build:
-    runs-on: windows-2019
+    runs-on: windows-2022
     strategy:
       matrix:
         platform: [win-amd64-librw_d3d9-oal, win-amd64-librw_gl3_glfw-oal]
@@ -47,27 +47,28 @@ jobs:
     - name: Build
       shell: cmd
       run: |
-        msbuild -m -p:Configuration=${{ matrix.buildtype }} -p:Platform=${{ matrix.platform }} build/reVC.sln
+        msbuild -m -p:Configuration=${{ matrix.buildtype }} -p:Platform=${{ matrix.platform }} build/re3.sln
 
-    - name: Create gamefiles directory
+    - name: Stage gamefiles (vanilla resources) + binaries
       shell: pwsh
       run: |
-        New-Item -ItemType Directory -Path "gamefiles" -Force
+        New-Item -ItemType Directory -Path "dist" -Force
+        Copy-Item -Path "gamefiles/vanilla/*" -Destination "dist/" -Recurse -Force
 
     - name: Copy binaries
       shell: pwsh
       run: |
-        Move-Item -Path "bin/${{ matrix.platform }}/${{ matrix.buildtype }}/reVC.exe" -Destination "gamefiles/" -Force
+        Move-Item -Path "bin/${{ matrix.platform }}/${{ matrix.buildtype }}/re3.exe" -Destination "dist/" -Force
-        Move-Item -Path "bin/${{ matrix.platform }}/${{ matrix.buildtype }}/reVC.pdb" -Destination "gamefiles/" -Force
+        Move-Item -Path "bin/${{ matrix.platform }}/${{ matrix.buildtype }}/re3.pdb" -Destination "dist/" -Force
 
     - name: Copy dependencies
       shell: pwsh
       run: |
-        Move-Item -Path "vendor/mpg123/dist/Win64/libmpg123-0.dll" -Destination "gamefiles/" -Force
+        Move-Item -Path "vendor/mpg123/dist/Win64/libmpg123-0.dll" -Destination "dist/" -Force
-        Move-Item -Path "vendor/openal-soft/dist/Win64/OpenAL32.dll" -Destination "gamefiles/" -Force
+        Move-Item -Path "vendor/openal-soft/dist/Win64/OpenAL32.dll" -Destination "dist/" -Force
 
     - name: Upload artifacts
       uses: actions/upload-artifact@v4
       with:
-        name: reVC_${{ matrix.buildtype }}_${{ matrix.platform }}
+        name: re3_${{ matrix.buildtype }}_${{ matrix.platform }}
-        path: gamefiles/*
+        path: dist/*

.github/workflows/re3_msvc_x86.yml

@@ -11,7 +11,7 @@ env:
 
 jobs:
   build:
-    runs-on: windows-2019
+    runs-on: windows-2022
     strategy:
       matrix:
         platform: 
@@ -53,27 +53,28 @@ jobs:
       run: |
         msbuild -m -p:Configuration=${{ matrix.buildtype }} -p:Platform=${{ matrix.platform }} build/re3.sln
 
-    - name: Create gamefiles directory
+    - name: Stage gamefiles (vanilla resources) + binaries
       shell: pwsh
       run: |
-        New-Item -ItemType Directory -Path "gamefiles" -Force
+        New-Item -ItemType Directory -Path "dist" -Force
+        Copy-Item -Path "gamefiles/vanilla/*" -Destination "dist/" -Recurse -Force
 
     - name: Copy binaries
       shell: pwsh
       run: |
-        Move-Item -Path "bin/${{ matrix.platform }}/${{ matrix.buildtype }}/re3.exe" -Destination "gamefiles/" -Force
+        Move-Item -Path "bin/${{ matrix.platform }}/${{ matrix.buildtype }}/re3.exe" -Destination "dist/" -Force
-        Move-Item -Path "bin/${{ matrix.platform }}/${{ matrix.buildtype }}/re3.pdb" -Destination "gamefiles/" -Force
+        Move-Item -Path "bin/${{ matrix.platform }}/${{ matrix.buildtype }}/re3.pdb" -Destination "dist/" -Force
 
     - name: Copy OAL dependencies
       if: contains(matrix.platform, 'oal')
       shell: pwsh
       run: |
-        Move-Item -Path "vendor/mpg123/dist/Win32/libmpg123-0.dll" -Destination "gamefiles/" -Force
+        Move-Item -Path "vendor/mpg123/dist/Win32/libmpg123-0.dll" -Destination "dist/" -Force
-        Move-Item -Path "vendor/openal-soft/dist/Win32/OpenAL32.dll" -Destination "gamefiles/" -Force
+        Move-Item -Path "vendor/openal-soft/dist/Win32/OpenAL32.dll" -Destination "dist/" -Force
 
     - name: Upload artifacts
       uses: actions/upload-artifact@v4
       with:
         name: re3_${{ matrix.buildtype }}_${{ matrix.platform }}
-        path: gamefiles/*
+        path: dist/*
 

CMakeLists.txt

@@ -34,8 +34,14 @@ option(${PROJECT}_WITH_OPUS "Build ${EXECUTABLE} with opus support" OFF)
 option(${PROJECT}_WITH_LIBSNDFILE "Build ${EXECUTABLE} with libsndfile (instead of internal decoder)" OFF)
 
 # Revisited Trilogy variant. ON = RT (10thAE resources + mods), OFF = vanilla.
+# RT exists only on the Nintendo Switch build; every other platform is vanilla,
+# so the option is not offered there and the vanilla resources are always used.
 # Passes NO_RT to the compiler when off so config.h can disable the RT define.
+if(NINTENDO_SWITCH)
     option(${PROJECT}_RT "Build the Revisited Trilogy (10thAE) variant; OFF = vanilla" ON)
+else()
+    set(${PROJECT}_RT OFF)
+endif()
 if(NOT ${PROJECT}_RT)
     add_compile_definitions(NO_RT)
 endif()
@@ -105,12 +111,15 @@ if(${PROJECT}_INSTALL)
         endif()
     endif()
 
-    # Distinguish the two resource variants so both archives can live side by side
+    # Distinguish the two Switch resource variants so both archives can live side by side.
+    # Other platforms only ever build vanilla, so they keep their original package name.
+    if(NINTENDO_SWITCH)
         if(${PROJECT}_RT)
             set(variant "-10thae")
         else()
             set(variant "-vanilla")
         endif()
+    endif()
 
     set(CPACK_PACKAGE_NAME "${PROJECT_NAME}${platform}${audio}${os}${compiler}${variant}")
     set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "GTA III reversed")