From f06ba3caf9455adfa71fa51b91a639d426534b07 Mon Sep 17 00:00:00 2001 From: "Nicolas \"Pixel\" Noble" Date: Mon, 18 Nov 2024 23:00:05 -0800 Subject: [PATCH] Fixing Linux build. --- src/gui/gui.cc | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/gui/gui.cc b/src/gui/gui.cc index 472e309e9..3f313671f 100644 --- a/src/gui/gui.cc +++ b/src/gui/gui.cc @@ -96,22 +96,6 @@ __declspec(dllexport) DWORD NvOptimusEnablement = 1; __declspec(dllexport) DWORD AmdPowerXpressRequestHighPerformance = 1; } -PCSX::GUI::GUI(std::vector& favorites) - : m_listener(g_system->m_eventBus), - m_typedDebugger(settings.get().value, favorites), - m_memcardManager(settings.get().value, favorites), - m_assembly(settings.get().value, favorites), - m_openIsoFileDialog(l_("Open Disk Image"), favorites), - m_openBinaryDialog(l_("Open Binary"), favorites), - m_openArchiveDialog(l_("Open Archive"), favorites), - m_selectBiosDialog(l_("Select BIOS"), favorites), - m_selectEXP1Dialog(l_("Select EXP1"), favorites), - m_isoBrowser(settings.get().value, favorites), - m_pioCart(settings.get().value, favorites) { - assert(g_gui == nullptr); - g_gui = this; -} - void PCSX::GUI::openUrl(std::string_view url) { std::string storage = std::string(url); ShellExecuteA(0, 0, storage.c_str(), 0, 0, SW_SHOW); @@ -130,6 +114,22 @@ void PCSX::GUI::openUrl(std::string_view url) { } #endif +PCSX::GUI::GUI(std::vector& favorites) + : m_listener(g_system->m_eventBus), + m_typedDebugger(settings.get().value, favorites), + m_memcardManager(settings.get().value, favorites), + m_assembly(settings.get().value, favorites), + m_openIsoFileDialog(l_("Open Disk Image"), favorites), + m_openBinaryDialog(l_("Open Binary"), favorites), + m_openArchiveDialog(l_("Open Archive"), favorites), + m_selectBiosDialog(l_("Select BIOS"), favorites), + m_selectEXP1Dialog(l_("Select EXP1"), favorites), + m_isoBrowser(settings.get().value, favorites), + m_pioCart(settings.get().value, favorites) { + assert(g_gui == nullptr); + g_gui = this; +} + using json = nlohmann::json; static std::function s_imguiUserErrorFunctor = nullptr;