mirror of
https://github.com/shadps4-emu/shadPS4.git
synced 2026-04-25 15:56:00 +03:00
[PR #2780] [MERGED] misc: Few small fixes. #2972
Labels
No labels
Bloodborne
bug
contributor wanted
documentation
enhancement
frontend
good first issue
help wanted
linux
pull-request
question
release
verification progress
No milestone
No project
No assignees
1 participant
Notifications
Due date
No due date set.
Dependencies
No dependencies set.
Reference
starred/shadPS4#2972
Loading…
Add table
Add a link
Reference in a new issue
No description provided.
Delete branch "%!s()"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
📋 Pull Request Information
Original PR: https://github.com/shadps4-emu/shadPS4/pull/2780
Author: @squidbus
Created: 4/13/2025
Status: ✅ Merged
Merged: 4/13/2025
Merged by: @squidbus
Base:
main← Head:fixes📝 Commits (2)
35db6fcqt: Use PNG file for logo.a470fbbbuild: Fix some CMake issues.📊 Changes
6 files changed (+9 additions, -10 deletions)
View changed files
📝
CMakeLists.txt(+5 -7)📝
REUSE.toml(+1 -0)➕
src/images/shadps4.png(+0 -0)📝
src/qt_gui/about_dialog.ui(+1 -1)📝
src/qt_gui/check_update.cpp(+1 -1)📝
src/shadps4.qrc(+1 -1)📄 Description
CMAKE_OSX_DEPLOYMENT_TARGETis recommended to be set as a cache variable.CMAKE_MODULE_PATHas it can cause conflicts with submodules; for example, there is an error currently because of a conflict between the shadPS4 and SDL3 scripts for finding libusb.Tested the PNG change in CI to make sure the logo is working there this time.
🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.