pacnpal/citron
1
0
Fork 0
mirror of https://git.eden-emu.dev/archive/citron synced 2026-03-22 17:46:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix(macOS): Compiler Issues

Browse Source
This commit is contained in:
collecting
2026-02-08 21:18:18 -05:00
parent 13e8c06f44
commit 04f2ba8d86
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/citron/configuration/configure_debug.cpp
View File

@@ -4,15 +4,15 @@
#include <QDesktopServices> #include <QDesktopServices>
#include <QMessageBox> #include <QMessageBox>
#include <QUrl> #include <QUrl>
#include "citron/configuration/configure_debug.h"
#include "citron/debugger/console.h"
#include "citron/uisettings.h"
#include "common/fs/path_util.h" #include "common/fs/path_util.h"
#include "common/logging/backend.h" #include "common/logging/backend.h"
#include "common/logging/filter.h" #include "common/logging/filter.h"
#include "common/settings.h" #include "common/settings.h"
#include "core/core.h" #include "core/core.h"
#include "ui_configure_debug.h" #include "ui_configure_debug.h"
#include "citron/configuration/configure_debug.h"
#include "citron/debugger/console.h"
#include "citron/uisettings.h"
ConfigureDebug::ConfigureDebug(const Core::System& system_, QWidget* parent) ConfigureDebug::ConfigureDebug(const Core::System& system_, QWidget* parent)
: QScrollArea(parent), ui{std::make_unique<Ui::ConfigureDebug>()}, system{system_} { : QScrollArea(parent), ui{std::make_unique<Ui::ConfigureDebug>()}, system{system_} {
@@ -111,7 +111,7 @@ void ConfigureDebug::ApplyConfiguration() {
Settings::values.extended_logging = ui->extended_logging->isChecked(); Settings::values.extended_logging = ui->extended_logging->isChecked();
Settings::values.perform_vulkan_check = ui->perform_vulkan_check->isChecked(); Settings::values.perform_vulkan_check = ui->perform_vulkan_check->isChecked();
UISettings::values.disable_web_applet = ui->disable_web_applet->isChecked(); UISettings::values.disable_web_applet = ui->disable_web_applet->isChecked();
Debugger::ToggleConsole(); CitronDebugger::ToggleConsole();
Common::Log::Filter filter; Common::Log::Filter filter;
filter.ParseFilterString(Settings::values.log_filter.GetValue()); filter.ParseFilterString(Settings::values.log_filter.GetValue());
Common::Log::SetGlobalFilter(filter); Common::Log::SetGlobalFilter(filter);

6
src/citron/debugger/console.cpp
View File

@@ -7,11 +7,11 @@
#include <wincon.h> #include <wincon.h>
#endif #endif
#include "common/logging/backend.h"
#include "citron/debugger/console.h" #include "citron/debugger/console.h"
#include "citron/uisettings.h" #include "citron/uisettings.h"
#include "common/logging/backend.h"
namespace Debugger { namespace CitronDebugger {
void ToggleConsole() { void ToggleConsole() {
static bool console_shown = false; static bool console_shown = false;
if (console_shown == UISettings::values.show_console.GetValue()) { if (console_shown == UISettings::values.show_console.GetValue()) {
@@ -46,4 +46,4 @@ void ToggleConsole() {
SetColorConsoleBackendEnabled(UISettings::values.show_console.GetValue()); SetColorConsoleBackendEnabled(UISettings::values.show_console.GetValue());
#endif #endif
} }
} // namespace Debugger } // namespace CitronDebugger

4
src/citron/debugger/console.h
View File

@@ -3,11 +3,11 @@
#pragma once #pragma once
namespace Debugger { namespace CitronDebugger {
/** /**
* Uses the WINAPI to hide or show the stderr console. This function is a placeholder until we can * Uses the WINAPI to hide or show the stderr console. This function is a placeholder until we can
* get a real qt logging window which would work for all platforms. * get a real qt logging window which would work for all platforms.
*/ */
void ToggleConsole(); void ToggleConsole();
} // namespace Debugger } // namespace CitronDebugger

2
src/citron/main.cpp
View File

@@ -1599,7 +1599,7 @@ void GMainWindow::RestoreUIState() {
vram_overlay->SetVisible(false); vram_overlay->SetVisible(false);
} }
Debugger::ToggleConsole(); CitronDebugger::ToggleConsole();
} }
void GMainWindow::OnAppFocusStateChanged(Qt::ApplicationState state) { void GMainWindow::OnAppFocusStateChanged(Qt::ApplicationState state) {