From f3f6a6a1942fc4370de93d48a4e5ee542270a63d Mon Sep 17 00:00:00 2001 From: Nadia Holmquist Pedersen Date: Thu, 1 Aug 2024 21:57:32 +0200 Subject: [PATCH] Fix building on i686 Linux I doubt anyone actually cares about support for it but hey may as well? --- src/DSi_AES.h | 2 +- src/frontend/qt_sdl/EmuInstance.cpp | 2 +- src/frontend/qt_sdl/Screen.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/DSi_AES.h b/src/DSi_AES.h index badeb192..f3b79868 100644 --- a/src/DSi_AES.h +++ b/src/DSi_AES.h @@ -28,7 +28,7 @@ namespace melonDS { #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wattributes" -#if defined(__GNUC__) && (__GNUC__ >= 11) // gcc 11.* +#if defined(__GNUC__) && (__GNUC__ >= 11) && defined(__SIZEOF_INT128__) // gcc 11.* // NOTE: Yes, the compiler does *not* recognize this code pattern, so it is indeed an optimization. __attribute((always_inline)) static void Bswap128(void* Dst, const void* Src) { diff --git a/src/frontend/qt_sdl/EmuInstance.cpp b/src/frontend/qt_sdl/EmuInstance.cpp index 999fb803..5fa1612b 100644 --- a/src/frontend/qt_sdl/EmuInstance.cpp +++ b/src/frontend/qt_sdl/EmuInstance.cpp @@ -1103,7 +1103,7 @@ bool EmuInstance::updateConsole(UpdateConsoleNDSArgs&& _ndsargs, UpdateConsoleGB }; auto jitargs = jitopt.GetBool("Enable") ? std::make_optional(_jitargs) : std::nullopt; #else - optional jitargs = std::nullopt; + std::optional jitargs = std::nullopt; #endif #ifdef GDBSTUB_ENABLED diff --git a/src/frontend/qt_sdl/Screen.cpp b/src/frontend/qt_sdl/Screen.cpp index c302d546..425d99b5 100644 --- a/src/frontend/qt_sdl/Screen.cpp +++ b/src/frontend/qt_sdl/Screen.cpp @@ -1109,7 +1109,7 @@ std::optional ScreenPanelGL::getWindowInfo() else { //qCritical() << "Unknown PNI platform " << platform_name; - Platform::Log(LogLevel::Error, "Unknown PNI platform %s\n", platform_name.toStdString().c_str()); + Platform::Log(Platform::LogLevel::Error, "Unknown PNI platform %s\n", platform_name.toStdString().c_str()); return std::nullopt; } #endif