piwalker/melonDS
1
0
Fork 0
mirror of https://github.com/melonDS-emu/melonDS.git synced 2024-11-14 13:27:41 -07:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Fix building on i686 Linux

Browse Source 
I doubt anyone actually cares about support for it but hey may as well?
This commit is contained in:
Nadia Holmquist Pedersen 2024-08-01 21:57:32 +02:00
parent 37c0320cbe
commit f3f6a6a194
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/DSi_AES.h
View File

@ -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)
{

2
src/frontend/qt_sdl/EmuInstance.cpp
View File

@ -1103,7 +1103,7 @@ bool EmuInstance::updateConsole(UpdateConsoleNDSArgs&& _ndsargs, UpdateConsoleGB
};
auto jitargs = jitopt.GetBool("Enable") ? std::make_optional(_jitargs) : std::nullopt;
#else
optional<JITArgs> jitargs = std::nullopt;
std::optional<JITArgs> jitargs = std::nullopt;
#endif
#ifdef GDBSTUB_ENABLED

2
src/frontend/qt_sdl/Screen.cpp
View File

@ -1109,7 +1109,7 @@ std::optional<WindowInfo> 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