Revert packaging of resources with builds

.github/linux-appimage-qt.sh

@@ -25,7 +25,6 @@ chmod a+x linuxdeploy-plugin-checkrt-x86_64.sh
 ./linuxdeploy-x86_64.AppImage --appdir AppDir
 ./linuxdeploy-plugin-checkrt-x86_64.sh --appdir AppDir
 
-rsync -a "$GITHUB_WORKSPACE/Resources/" AppDir/
 cp -a "$GITHUB_WORKSPACE/build/translations" AppDir/usr/bin
 
 ./linuxdeploy-x86_64.AppImage --appdir AppDir -d "$GITHUB_WORKSPACE"/dist/net.shadps4.shadPS4.desktop  -e "$GITHUB_WORKSPACE"/build/shadps4 -i "$GITHUB_WORKSPACE"/src/images/net.shadps4.shadPS4.svg --plugin qt

.github/linux-appimage-sdl.sh

@@ -14,8 +14,6 @@ wget -q https://github.com/linuxdeploy/linuxdeploy-plugin-checkrt/releases/downl
 chmod a+x linuxdeploy-x86_64.AppImage
 chmod a+x linuxdeploy-plugin-checkrt-x86_64.sh
 
-cp -a "$GITHUB_WORKSPACE/Resources" AppDir
-
 # Build AppImage
 ./linuxdeploy-x86_64.AppImage --appdir AppDir
 ./linuxdeploy-plugin-checkrt-x86_64.sh --appdir AppDir

.github/workflows/build.yml

@@ -76,7 +76,7 @@ jobs:
             ${{ env.cache-name }}-
 
     - name: Cache CMake Build
-      uses: hendrikmuhs/ccache-action@v1.2.14
+      uses: hendrikmuhs/ccache-action@v1.2.17
       env:
           cache-name: ${{ runner.os }}-sdl-cache-cmake-build
       with:
@@ -94,17 +94,11 @@ jobs:
     - name: Build
       run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --parallel $env:NUMBER_OF_PROCESSORS
 
-    - name: Move Files and Resources
-      run: |
-        mkdir upload
-        move build/Resources upload
-        move build/shadPS4.exe upload
-
     - name: Upload Windows SDL artifact
       uses: actions/upload-artifact@v4
       with:
         name: shadps4-win64-sdl-${{ needs.get-info.outputs.date }}-${{ needs.get-info.outputs.shorthash }}
-        path: upload/
+        path: ${{github.workspace}}/build/shadPS4.exe
 
   windows-qt:
     runs-on: windows-2025
@@ -117,7 +111,7 @@ jobs:
     - name: Setup Qt
       uses: jurplel/install-qt-action@v4
       with:
-        version: 6.8.2
+        version: 6.9.0
         host: windows
         target: desktop
         arch: win64_msvc2022_64
@@ -136,7 +130,7 @@ jobs:
             ${{ env.cache-name }}-
 
     - name: Cache CMake Build
-      uses: hendrikmuhs/ccache-action@v1.2.14
+      uses: hendrikmuhs/ccache-action@v1.2.17
       env:
           cache-name: ${{ runner.os }}-qt-cache-cmake-build
       with:
@@ -154,14 +148,10 @@ jobs:
     - name: Build
       run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --parallel $env:NUMBER_OF_PROCESSORS
 
-    - name: Move Files and Resources
-      run: |
-        mkdir upload
-        move build/Resources upload
-        move build/shadPS4.exe upload
-
     - name: Deploy and Package
       run: |
+        mkdir upload
+        move build/shadPS4.exe upload
         windeployqt --no-compiler-runtime --no-system-d3d-compiler --no-system-dxc-compiler --dir upload upload/shadPS4.exe
         Compress-Archive -Path upload/* -DestinationPath shadps4-win64-qt-${{ needs.get-info.outputs.date }}-${{ needs.get-info.outputs.shorthash }}.zip
 
@@ -196,7 +186,7 @@ jobs:
             ${{ env.cache-name }}- 
 
     - name: Cache CMake Build
-      uses: hendrikmuhs/ccache-action@v1.2.14
+      uses: hendrikmuhs/ccache-action@v1.2.17
       env:
           cache-name: ${{runner.os}}-sdl-cache-cmake-build
       with:
@@ -211,14 +201,10 @@ jobs:
     - name: Build
       run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --parallel $(sysctl -n hw.ncpu)
 
-    - name: Move Files and Resources
-      run: |
-        mkdir upload
-        mv build/shadps4 upload
-        mv build/Resources upload
-
     - name: Package and Upload macOS SDL artifact
       run: |
+        mkdir upload
+        mv ${{github.workspace}}/build/shadps4 upload
         cp ${{github.workspace}}/build/externals/MoltenVK/libMoltenVK.dylib upload
         tar cf shadps4-macos-sdl.tar.gz -C upload .
     - uses: actions/upload-artifact@v4
@@ -242,7 +228,7 @@ jobs:
     - name: Setup Qt
       uses: jurplel/install-qt-action@v4
       with:
-        version: 6.8.2
+        version: 6.9.0
         host: mac
         target: desktop
         arch: clang_64
@@ -261,7 +247,7 @@ jobs:
             ${{ env.cache-name }}- 
 
     - name: Cache CMake Build
-      uses: hendrikmuhs/ccache-action@v1.2.14
+      uses: hendrikmuhs/ccache-action@v1.2.17
       env:
           cache-name: ${{runner.os}}-qt-cache-cmake-build
       with:
@@ -275,12 +261,11 @@ jobs:
 
     - name: Build
       run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --parallel $(sysctl -n hw.ncpu)
-    
-    - name: Move Files and Resources
-      run: "mkdir upload\n\t mv ${{github.workspace}}/build/shadps4.app upload\n"
 
     - name: Package and Upload macOS Qt artifact
       run: |
+        mkdir upload
+        mv ${{github.workspace}}/build/shadps4.app upload
         macdeployqt upload/shadps4.app
         tar cf shadps4-macos-qt.tar.gz -C upload .
     - uses: actions/upload-artifact@v4
@@ -311,7 +296,7 @@ jobs:
             ${{ env.cache-name }}- 
 
     - name: Cache CMake Build
-      uses: hendrikmuhs/ccache-action@v1.2.14
+      uses: hendrikmuhs/ccache-action@v1.2.17
       env:
           cache-name: ${{ runner.os }}-sdl-cache-cmake-build
       with:
@@ -323,16 +308,15 @@ jobs:
 
     - name: Build
       run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --parallel $(nproc)
-
+  
     - name: Package and Upload Linux(ubuntu64) SDL artifact 
       run: |
-        mkdir upload
+        ls -la ${{ github.workspace }}/build/shadps4
-        cp build/shadps4 upload
+    
-        cp -a build/Resources upload
     - uses: actions/upload-artifact@v4
       with:
         name: shadps4-ubuntu64-${{ needs.get-info.outputs.date }}-${{ needs.get-info.outputs.shorthash }}
-        path: upload/
+        path: ${{ github.workspace }}/build/shadps4
 
     - name: Run AppImage packaging script
       run:  ./.github/linux-appimage-sdl.sh
@@ -368,7 +352,7 @@ jobs:
             ${{ env.cache-name }}- 
 
     - name: Cache CMake Build
-      uses: hendrikmuhs/ccache-action@v1.2.14
+      uses: hendrikmuhs/ccache-action@v1.2.17
       env:
           cache-name: ${{ runner.os }}-qt-cache-cmake-build
       with:
@@ -415,7 +399,7 @@ jobs:
             ${{ env.cache-name }}- 
 
     - name: Cache CMake Build
-      uses: hendrikmuhs/ccache-action@v1.2.14
+      uses: hendrikmuhs/ccache-action@v1.2.17
       env:
           cache-name: ${{ runner.os }}-sdl-gcc-cache-cmake-build
       with:
@@ -451,7 +435,7 @@ jobs:
             ${{ env.cache-name }}- 
 
     - name: Cache CMake Build
-      uses: hendrikmuhs/ccache-action@v1.2.14
+      uses: hendrikmuhs/ccache-action@v1.2.17
       env:
           cache-name: ${{ runner.os }}-qt-gcc-cache-cmake-build
       with:

CMakeLists.txt

@@ -987,6 +987,7 @@ else()
         ${SHADER_RECOMPILER}
         ${VIDEO_CORE}
         ${EMULATOR}
+        ${RESOURCEFOLDER}
         src/main.cpp
         src/emulator.cpp
         src/emulator.h
@@ -1162,15 +1163,3 @@ if (ENABLE_QT_GUI AND CMAKE_SYSTEM_NAME STREQUAL "Linux")
     install(FILES ".github/shadps4.png" DESTINATION "share/icons/hicolor/512x512/apps" RENAME "net.shadps4.shadPS4.png")
     install(FILES "src/images/net.shadps4.shadPS4.svg" DESTINATION "share/icons/hicolor/scalable/apps")
 endif()
-
-
-# copy Resource folder (trophy images) inside Mac App bundle resources folder
-if (ENABLE_QT_GUI AND APPLE)
-set_source_files_properties(${RESOURCEFOLDER} PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
-else()
-add_custom_target(copy-files ALL
-    COMMAND ${CMAKE_COMMAND} -E copy_directory
-    ${CMAKE_SOURCE_DIR}/Resources/
-    ${CMAKE_BINARY_DIR}/Resources/
-    )
-endif()

CMakeSettings.json

@@ -1,40 +1,40 @@
 {
-    "configurations": [
+  "configurations": [
-        {
+    {
-            "name": "x64-Clang-Release",
+      "name": "x64-Clang-Release",
-            "generator": "Ninja",
+      "generator": "Ninja",
-            "configurationType": "Release",
+      "configurationType": "Release",
-            "buildRoot": "${projectDir}\\Build\\${name}",
+      "buildRoot": "${projectDir}\\Build\\${name}",
-            "installRoot": "${projectDir}\\Install\\${name}",
+      "installRoot": "${projectDir}\\Install\\${name}",
-            "cmakeCommandArgs": "",
+      "cmakeCommandArgs": "",
-            "buildCommandArgs": "",
+      "buildCommandArgs": "",
-            "ctestCommandArgs": "",
+      "ctestCommandArgs": "",
-            "inheritEnvironments": [ "clang_cl_x64_x64" ],
+      "inheritEnvironments": [ "clang_cl_x64_x64" ],
-            "intelliSenseMode": "windows-clang-x64"
+      "intelliSenseMode": "windows-clang-x64"
-        },
+    },
-        {
+    {
-            "name": "x64-Clang-Debug",
+      "name": "x64-Clang-Debug",
-            "generator": "Ninja",
+      "generator": "Ninja",
-            "configurationType": "Debug",
+      "configurationType": "Debug",
-            "buildRoot": "${projectDir}\\Build\\${name}",
+      "buildRoot": "${projectDir}\\Build\\${name}",
-            "installRoot": "${projectDir}\\Install\\${name}",
+      "installRoot": "${projectDir}\\Install\\${name}",
-            "cmakeCommandArgs": "-DENABLE_QT_GUI=ON -DCMAKE_PREFIX_PATH=C:\\Qt\\6.9.0\\msvc2022_64",
+      "cmakeCommandArgs": "",
-            "buildCommandArgs": "",
+      "buildCommandArgs": "",
-            "ctestCommandArgs": "",
+      "ctestCommandArgs": "",
-            "inheritEnvironments": [ "clang_cl_x64_x64" ],
+      "inheritEnvironments": [ "clang_cl_x64_x64" ],
-            "intelliSenseMode": "windows-clang-x64"
+      "intelliSenseMode": "windows-clang-x64"
-        },
+    },
-        {
+    {
-            "name": "x64-Clang-RelWithDebInfo",
+      "name": "x64-Clang-RelWithDebInfo",
-            "generator": "Ninja",
+      "generator": "Ninja",
-            "configurationType": "RelWithDebInfo",
+      "configurationType": "RelWithDebInfo",
-            "buildRoot": "${projectDir}\\Build\\${name}",
+      "buildRoot": "${projectDir}\\Build\\${name}",
-            "installRoot": "${projectDir}\\Install\\${name}",
+      "installRoot": "${projectDir}\\Install\\${name}",
-            "cmakeCommandArgs": "",
+      "cmakeCommandArgs": "",
-            "buildCommandArgs": "",
+      "buildCommandArgs": "",
-            "ctestCommandArgs": "",
+      "ctestCommandArgs": "",
-            "inheritEnvironments": [ "clang_cl_x64_x64" ],
+      "inheritEnvironments": [ "clang_cl_x64_x64" ],
-            "intelliSenseMode": "windows-clang-x64"
+      "intelliSenseMode": "windows-clang-x64"
-        }
+    }
-    ]
+  ]
 }

REUSE.toml

@@ -107,3 +107,7 @@ path = "externals/gcn/include/**"
 SPDX-FileCopyrightText = "NONE"
 SPDX-License-Identifier = "CC0-1.0"
 
+[[annotations]]
+path = "cmake/CMakeRC.cmake"
+SPDX-FileCopyrightText = "Copyright (c) 2017 vector-of-bool <vectorofbool@gmail.com>"
+SPDX-License-Identifier = "MIT"

cmake/CMakeRC.cmake

@@ -1,3 +1,25 @@
+# MIT License
+# 
+# Copyright (c) 2017 vector-of-bool <vectorofbool@gmail.com>
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
 # This block is executed when generating an intermediate resource file, not when
 # running in CMake configure mode
 if(_CMRC_GENERATE_MODE)

src/qt_gui/trophy_viewer.cpp

@@ -119,7 +119,6 @@ void TrophyViewer::PopulateTrophyWidget(QString title) {
             item->setFlags(item->flags() & ~Qt::ItemIsEditable);
             tableWidget->setItem(row, 1, item);
 
-
             const std::string filename = GetTrpType(trpType[row].at(0));
             QTableWidgetItem* typeitem = new QTableWidgetItem();