From c4f7c1bff7e68231970b2a73f215287c4873fb2d Mon Sep 17 00:00:00 2001 From: Nadia Holmquist Pedersen Date: Tue, 19 Nov 2024 00:34:16 +0100 Subject: [PATCH] fix compiling without JIT --- src/frontend/qt_sdl/EmuSettingsDialog.cpp | 7 ++++++- src/frontend/qt_sdl/Window.cpp | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/frontend/qt_sdl/EmuSettingsDialog.cpp b/src/frontend/qt_sdl/EmuSettingsDialog.cpp index ed5eba10..30b92fd1 100644 --- a/src/frontend/qt_sdl/EmuSettingsDialog.cpp +++ b/src/frontend/qt_sdl/EmuSettingsDialog.cpp @@ -536,9 +536,14 @@ void EmuSettingsDialog::on_btnDSiSDFolderBrowse_clicked() void EmuSettingsDialog::on_chkEnableJIT_toggled() { bool disabled = !ui->chkEnableJIT->isChecked(); +#ifdef JIT_ENABLED + bool fastmemSupported = ARMJIT_Memory::IsFastMemSupported(); +#else + bool fastmemSupported = false; +#endif ui->chkJITBranchOptimisations->setDisabled(disabled); ui->chkJITLiteralOptimisations->setDisabled(disabled); - ui->chkJITFastMemory->setDisabled(disabled || !ARMJIT_Memory::IsFastMemSupported()); + ui->chkJITFastMemory->setDisabled(disabled || !fastmemSupported); ui->spnJITMaximumBlockSize->setDisabled(disabled); on_cbGdbEnabled_toggled(); diff --git a/src/frontend/qt_sdl/Window.cpp b/src/frontend/qt_sdl/Window.cpp index a80b385c..a156a993 100644 --- a/src/frontend/qt_sdl/Window.cpp +++ b/src/frontend/qt_sdl/Window.cpp @@ -857,7 +857,7 @@ void MainWindow::createScreenPanel() // Check that creating the context hasn't failed if (panelGL->createContext() == false) { - Log(LogLevel::Error, "Failed to create OpenGL context, falling back to Software Renderer.\n"); + Log(Platform::LogLevel::Error, "Failed to create OpenGL context, falling back to Software Renderer.\n"); hasOGL = false; globalCfg.SetBool("Screen.UseGL", false);