Skip to content

Commit

Permalink
Fixing Linux build.
Browse files Browse the repository at this point in the history
  • Loading branch information
nicolasnoble committed Nov 19, 2024
1 parent 39f7549 commit f06ba3c
Showing 1 changed file with 16 additions and 16 deletions.
32 changes: 16 additions & 16 deletions src/gui/gui.cc
Original file line number Diff line number Diff line change
Expand Up @@ -96,22 +96,6 @@ __declspec(dllexport) DWORD NvOptimusEnablement = 1;
__declspec(dllexport) DWORD AmdPowerXpressRequestHighPerformance = 1;
}

PCSX::GUI::GUI(std::vector<std::string>& favorites)
: m_listener(g_system->m_eventBus),
m_typedDebugger(settings.get<ShowTypedDebugger>().value, favorites),
m_memcardManager(settings.get<ShowMemcardManager>().value, favorites),
m_assembly(settings.get<ShowAssembly>().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<ShowIsoBrowser>().value, favorites),
m_pioCart(settings.get<ShowPIOCartConfig>().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);
Expand All @@ -130,6 +114,22 @@ void PCSX::GUI::openUrl(std::string_view url) {
}
#endif

PCSX::GUI::GUI(std::vector<std::string>& favorites)
: m_listener(g_system->m_eventBus),
m_typedDebugger(settings.get<ShowTypedDebugger>().value, favorites),
m_memcardManager(settings.get<ShowMemcardManager>().value, favorites),
m_assembly(settings.get<ShowAssembly>().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<ShowIsoBrowser>().value, favorites),
m_pioCart(settings.get<ShowPIOCartConfig>().value, favorites) {
assert(g_gui == nullptr);
g_gui = this;
}

using json = nlohmann::json;

static std::function<void(const char*)> s_imguiUserErrorFunctor = nullptr;
Expand Down

0 comments on commit f06ba3c

Please sign in to comment.