From d9220828197459d8f9ef898c0c003a18ed2c91cf Mon Sep 17 00:00:00 2001
From: rainmakerv2 <30595646+jpau02@users.noreply.github.com>
Date: Sat, 22 Feb 2025 05:40:21 +0800
Subject: [PATCH] Address Review comments

Update build.yml

Update build.yml

Update build.yml

Update build.yml

Update build.yml

Update build.yml

Update build.yml

test
---
 .github/workflows/build.yml | 24 +++++++++++++++++-------
 CMakeLists.txt              | 12 ++++++------
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a2b531cf2..d86cba2d9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -95,7 +95,10 @@ jobs:
       run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --parallel $env:NUMBER_OF_PROCESSORS
 
     - name: Move Files and Resources
-      run: "mkdir upload\n\t move build/Resources upload\nmove build/shadPS4.exe upload\n"
+      run: |
+        mkdir upload
+        move build/Resources upload
+        move build/shadPS4.exe upload
 
     - name: Upload Windows SDL artifact
       uses: actions/upload-artifact@v4
@@ -152,7 +155,10 @@ jobs:
       run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --parallel $env:NUMBER_OF_PROCESSORS
 
     - name: Move Files and Resources
-      run: "mkdir upload\n\t move build/Resources upload\nmove build/shadPS4.exe upload\n"
+      run: |
+        mkdir upload
+        move build/Resources upload
+        move build/shadPS4.exe upload
 
     - name: Deploy and Package
       run: |
@@ -206,7 +212,10 @@ jobs:
       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 upload\nmv ${{github.workspace}}/build/Resources upload\n"
+      run: |
+        mkdir upload
+        mv build/shadps4 upload
+        mv build/Resources upload
 
     - name: Package and Upload macOS SDL artifact
       run: |
@@ -314,15 +323,16 @@ jobs:
 
     - name: Build
       run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --parallel $(nproc)
-  
+
     - name: Package and Upload Linux(ubuntu64) SDL artifact 
       run: |
-        ls -la ${{ github.workspace }}/build/shadps4
-    
+        mkdir upload
+        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: ${{ github.workspace }}/build/shadps4
+        path: upload/
 
     - name: Run AppImage packaging script
       run:  ./.github/linux-appimage-sdl.sh
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 009244416..14cf0987e 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -957,7 +957,11 @@ set(QT_GUI src/qt_gui/about_dialog.cpp
 )
 endif()
 
-set(RESOURCEFOLDER ${CMAKE_SOURCE_DIR}/Resources)
+set(RESOURCEFOLDER Resources/bronze.png
+    		   Resources/gold.png
+    		   Resources/platinum.png
+    		   Resources/silver.png
+)
 
 if (ENABLE_QT_GUI)
     qt_add_executable(shadps4
@@ -1152,11 +1156,7 @@ endif()
 
 # copy Resource folder (trophy images) inside Mac App bundle resources folder
 if (ENABLE_QT_GUI AND APPLE)
-add_custom_command(TARGET shadps4 POST_BUILD
-  COMMAND ${CMAKE_COMMAND} -E copy_directory
-    "${CMAKE_SOURCE_DIR}/Resources"
-    "$<TARGET_FILE_DIR:shadps4>/../Resources"
-)
+set_source_files_properties(${RESOURCEFOLDER} PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
 else()
 add_custom_target(copy-files ALL
     COMMAND ${CMAKE_COMMAND} -E copy_directory