Compare commits

...

4 Commits

Author SHA1 Message Date
mitaclaw
40a78c543c
Merge 6aa59496aa into 2c92e5b5b3 2024-11-12 13:28:59 -06:00
OatmealDome
2c92e5b5b3
Merge pull request #13160 from cpba/flatpak-6.8-runtime
Flatpak: Upgrade kde runtime to 6.8
2024-11-12 00:30:46 -05:00
Carles Pastor
fe96bf4108 Flatpak: Upgrade kde runtime to 6.8
this version bundles SDL2-2.30.6, the temporary measure of building the
vendored version from exports is no longer necessary.
2024-11-10 12:06:06 +01:00
mitaclaw
6aa59496aa Expression: Support Case-Insensitive Register Names 2024-10-12 13:20:02 -07:00
3 changed files with 5 additions and 28 deletions

View File

@ -1,22 +0,0 @@
{
"name": "SDL2",
"buildsystem": "autotools",
"config-opts": ["--disable-static"],
"sources": [
{
"type": "dir",
"path": "../../Externals/SDL/SDL"
}
],
"cleanup": [ "/bin/sdl2-config",
"/include",
"/lib/libSDL2.la",
"/lib/libSDL2main.a",
"/lib/libSDL2main.la",
"/lib/libSDL2_test.a",
"/lib/libSDL2_test.la",
"/lib/cmake",
"/share/aclocal",
"/lib/pkgconfig"]
}

View File

@ -1,6 +1,6 @@
app-id: org.DolphinEmu.dolphin-emu
runtime: org.kde.Platform
runtime-version: '6.7'
runtime-version: '6.8'
sdk: org.kde.Sdk
command: dolphin-emu-wrapper
rename-desktop-file: dolphin-emu.desktop
@ -47,9 +47,6 @@ modules:
url: https://github.com/Unrud/xdg-screensaver-shim/archive/0.0.2.tar.gz
sha256: 0ed2a69fe6ee6cbffd2fe16f85116db737f17fb1e79bfb812d893cf15c728399
# build the vendored SDL2 from Externals until the runtime gets 2.30.6
- SDL2/SDL2.json
- name: dolphin-emu
buildsystem: cmake-ninja
config-opts:

View File

@ -27,6 +27,7 @@ using std::isnan;
#include "Common/CommonTypes.h"
#include "Common/Logging/Log.h"
#include "Common/StringUtil.h"
#include "Core/Core.h"
#include "Core/Debugger/Debugger_SymbolMap.h"
#include "Core/PowerPC/MMU.h"
@ -393,8 +394,9 @@ Expression::Expression(std::string_view text, ExprPointer ex, ExprVarListPointer
"Expression: Sorted lookup should not contain duplicate keys.");
for (auto* v = m_vars->head; v != nullptr; v = v->next)
{
const auto iter = std::ranges::lower_bound(sorted_lookup, v->name, {}, &LookupKV::first);
if (iter != sorted_lookup.end() && iter->first == v->name)
const auto iter = std::ranges::lower_bound(sorted_lookup, v->name,
Common::CaseInsensitiveLess{}, &LookupKV::first);
if (iter != sorted_lookup.end() && Common::CaseInsensitiveEquals(iter->first, v->name))
m_binds.emplace_back(iter->second);
else
m_binds.emplace_back();