mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-08-04 08:22:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Address Review comments

Browse Source 
Update build.yml

Update build.yml

Update build.yml

Update build.yml

Update build.yml

Update build.yml

Update build.yml

test
This commit is contained in:
rainmakerv2 2025-02-22 05:40:21 +08:00 committed by rainmakerv2
parent 6dbc2b4711
commit d922082819
2 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
.github/workflows/build.yml vendored
View File

@ -95,7 +95,10 @@ jobs:
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --parallel $env:NUMBER_OF_PROCESSORS run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --parallel $env:NUMBER_OF_PROCESSORS
- name: Move Files and Resources - 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 - name: Upload Windows SDL artifact
uses: actions/upload-artifact@v4 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 run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --parallel $env:NUMBER_OF_PROCESSORS
- name: Move Files and Resources - 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 - name: Deploy and Package
run: | run: |
@ -206,7 +212,10 @@ jobs:
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --parallel $(sysctl -n hw.ncpu) run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --parallel $(sysctl -n hw.ncpu)
- name: Move Files and Resources - 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 - name: Package and Upload macOS SDL artifact
run: | run: |
@ -317,12 +326,13 @@ jobs:
- name: Package and Upload Linux(ubuntu64) SDL artifact - name: Package and Upload Linux(ubuntu64) SDL artifact
run: | run: |
ls -la ${{ github.workspace }}/build/shadps4 mkdir upload
cp build/shadps4 upload
cp -a build/Resources upload
- uses: actions/upload-artifact@v4 - uses: actions/upload-artifact@v4
with: with:
name: shadps4-ubuntu64-${{ needs.get-info.outputs.date }}-${{ needs.get-info.outputs.shorthash }} 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 - name: Run AppImage packaging script
run: ./.github/linux-appimage-sdl.sh run: ./.github/linux-appimage-sdl.sh

12
CMakeLists.txt
View File

@ -957,7 +957,11 @@ set(QT_GUI src/qt_gui/about_dialog.cpp
) )
endif() 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) if (ENABLE_QT_GUI)
qt_add_executable(shadps4 qt_add_executable(shadps4
@ -1152,11 +1156,7 @@ endif()
# copy Resource folder (trophy images) inside Mac App bundle resources folder # copy Resource folder (trophy images) inside Mac App bundle resources folder
if (ENABLE_QT_GUI AND APPLE) if (ENABLE_QT_GUI AND APPLE)
add_custom_command(TARGET shadps4 POST_BUILD set_source_files_properties(${RESOURCEFOLDER} PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
COMMAND ${CMAKE_COMMAND} -E copy_directory
"${CMAKE_SOURCE_DIR}/Resources"
"$<TARGET_FILE_DIR:shadps4>/../Resources"
)
else() else()
add_custom_target(copy-files ALL add_custom_target(copy-files ALL
COMMAND ${CMAKE_COMMAND} -E copy_directory COMMAND ${CMAKE_COMMAND} -E copy_directory