Merge pull request #463 from Xphalnos/main

Misc changes

.github/workflows/macos.yml

@@ -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

.github/workflows/windows.yml

@@ -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

CMakeLists.txt

@@ -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)

externals/glslang

@@ -1 +1 @@
-Subproject commit 7c4d91e7819a1d27213aa3499953d54ae1a00e8f
+Subproject commit d59c84d388c805022e2bddea08aa41cbe7e43e55

externals/toml11

@@ -1 +1 @@
-Subproject commit fcb1d3d7e5885edfadbbe9572991dc4b3248af58
+Subproject commit cc0bee4fd46ea1f5db147d63ea545208cc9e8405

externals/vma

@@ -1 +1 @@
-Subproject commit 871913da6a4b132b567d7b65c509600363c0041e
+Subproject commit e1bdbca9baf4d682fb6066b380f4aa4a7bdbb58a

externals/vulkan-headers

@@ -1 +1 @@
-Subproject commit 595c8d4794410a4e64b98dc58d27c0310d7ea2fd
+Subproject commit d205aff40b4e15d4c568523ee6a26f85138126d9

externals/xxhash

@@ -1 +1 @@
-Subproject commit ee65ff988bab34a184c700e2fbe1e1c5bc27485d
+Subproject commit dbea33e47e7c0fe0b7c8592cd931c7430c1f130d

externals/zydis

@@ -1 +1 @@
-Subproject commit 16c6a369c193981e9cf314126589eaa8763f92c3
+Subproject commit bd73bc03b0aacaa89c9c203b9b43cd08f1b1843b

src/qt_gui/main_window.cpp

@@ -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();

src/qt_gui/main_window_ui.h

@@ -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));