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

Misc changes

Browse Source
This commit is contained in:
Xphalnos
2024-08-18 17:30:26 +02:00
parent 63938ba8dd
commit 70576035b0
11 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/macos.yml vendored
View File

@@ -43,10 +43,10 @@ jobs:
mv ${{github.workspace}}/build/shadps4 upload
cp $(arch -x86_64 /usr/local/bin/brew --prefix)/opt/molten-vk/lib/libMoltenVK.dylib upload
install_name_tool -add_rpath "@loader_path" upload/shadps4
tar cf shadps4-macos.tar.gz -C upload .
tar cf shadps4-macos-sdl.tar.gz -C upload .
- name: Upload executable
uses: actions/upload-artifact@v4
with:
name: shadps4-macos
path: shadps4-macos.tar.gz
name: shadps4-macos-sdl
path: shadps4-macos-sdl.tar.gz

2
.github/workflows/windows.yml vendored
View File

@@ -29,6 +29,6 @@ jobs:
- name: Upload executable
uses: actions/upload-artifact@v4
with:
name: shadps4-win64
name: shadps4-win64-sdl
path: |
${{github.workspace}}/build/Release/shadPS4.exe

2
CMakeLists.txt
View File

@@ -73,7 +73,7 @@ find_package(glslang 14.2.0 CONFIG)
find_package(magic_enum 0.9.6 CONFIG)
find_package(RenderDoc 1.6.0 MODULE)
find_package(SDL3 3.1.2 CONFIG)
find_package(toml11 3.8.1 CONFIG)
find_package(toml11 4.2.0 CONFIG)
find_package(tsl-robin-map 1.3.0 CONFIG)
find_package(VulkanHeaders 1.3.289 CONFIG)
find_package(VulkanMemoryAllocator 3.1.0 CONFIG)

2
externals/glslang vendored

Submodule externals/glslang updated: 7c4d91e781...d59c84d388

2
externals/toml11 vendored

Submodule externals/toml11 updated: fcb1d3d7e5...cc0bee4fd4

2
externals/vma vendored

Submodule externals/vma updated: 871913da6a...e1bdbca9ba

2
externals/vulkan-headers vendored

Submodule externals/vulkan-headers updated: 595c8d4794...d205aff40b

2
externals/xxhash vendored

Submodule externals/xxhash updated: ee65ff988b...dbea33e47e

2
externals/zydis vendored

Submodule externals/zydis updated: 16c6a369c1...bd73bc03b0

5
src/qt_gui/main_window.cpp
View File

@@ -202,6 +202,11 @@ void MainWindow::CreateConnects() {
connect(m_game_list_frame.get(), &QTableWidget::cellDoubleClicked, this,
&MainWindow::StartGame);
connect(ui->configureAct, &QAction::triggered, this, [this]() {
auto settingsDialog = new SettingsDialog(m_physical_devices, this);
settingsDialog->exec();
});
connect(ui->settingsButton, &QPushButton::clicked, this, [this]() {
auto settingsDialog = new SettingsDialog(m_physical_devices, this);
settingsDialog->exec();

7
src/qt_gui/main_window_ui.h
View File

@@ -46,6 +46,7 @@ public:
QAction* dumpGameListAct;
QAction* pkgViewerAct;
QAction* aboutAct;
QAction* configureAct;
QAction* setThemeDark;
QAction* setThemeLight;
QAction* setThemeGreen;
@@ -143,6 +144,8 @@ public:
pkgViewerAct->setIcon(QIcon(":images/file_icon.png"));
aboutAct = new QAction(MainWindow);
aboutAct->setObjectName("aboutAct");
configureAct = new QAction(MainWindow);
configureAct->setObjectName("configureAct");
setThemeDark = new QAction(MainWindow);
setThemeDark->setObjectName("setThemeDark");
setThemeDark->setCheckable(true);
@@ -285,6 +288,7 @@ public:
menuGame_List_Mode->addAction(setlistModeListAct);
menuGame_List_Mode->addAction(setlistModeGridAct);
menuGame_List_Mode->addAction(setlistElfAct);
menuSettings->addAction(configureAct);
menuSettings->addAction(gameInstallPathAct);
menuSettings->addAction(menuUtils->menuAction());
menuUtils->addAction(dumpGameListAct);
@@ -303,7 +307,8 @@ public:
bootInstallPkgAct->setText(
QCoreApplication::translate("MainWindow", "Install Packages (PKG)", nullptr));
bootGameAct->setText(QCoreApplication::translate("MainWindow", "Boot Game", nullptr));
aboutAct->setText(QCoreApplication::translate("MainWindow", "About", nullptr));
aboutAct->setText(QCoreApplication::translate("MainWindow", "About shadPS4", nullptr));
configureAct->setText(QCoreApplication::translate("MainWindow", "Configure...", nullptr));
#if QT_CONFIG(tooltip)
bootInstallPkgAct->setToolTip(QCoreApplication::translate(
"MainWindow", "Install application from a .pkg file", nullptr));