diff options
| author | crueter <crueter@eden-emu.dev> | 2025-10-17 04:20:11 +0200 |
|---|---|---|
| committer | crueter <crueter@eden-emu.dev> | 2025-10-17 04:20:11 +0200 |
| commit | 551f244dfd48d0e0c1d6db82b39d1ccaa1b6dc06 (patch) | |
| tree | 03cc2d6cb0de906b7c8a7a3bb3264802ad6f6163 /.patch | |
| parent | ef14303c483672cb15bf91bdfb387e930c7288d9 (diff) | |
[dynarmic, qt] fix build with QuaZip <=1.4 and fmt v9 (#2755)
Signed-off-by: crueter <crueter@eden-emu.dev>
Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/2755
Diffstat (limited to '.patch')
| -rw-r--r-- | .patch/mcl/0001-assert-macro.patch | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/.patch/mcl/0001-assert-macro.patch b/.patch/mcl/0001-assert-macro.patch new file mode 100644 index 0000000000..2d7d0dd1b0 --- /dev/null +++ b/.patch/mcl/0001-assert-macro.patch @@ -0,0 +1,55 @@ +diff --git a/include/mcl/assert.hpp b/include/mcl/assert.hpp +index f77dbe7..9ec0b9c 100644 +--- a/include/mcl/assert.hpp ++++ b/include/mcl/assert.hpp +@@ -23,8 +23,11 @@ template<typename... Ts> + + } // namespace mcl::detail + ++#ifndef UNREACHABLE + #define UNREACHABLE() ASSERT_FALSE("Unreachable code!") ++#endif + ++#ifndef ASSERT + #define ASSERT(expr) \ + [&] { \ + if (std::is_constant_evaluated()) { \ +@@ -37,7 +40,9 @@ template<typename... Ts> + } \ + } \ + }() ++#endif + ++#ifndef ASSERT_MSG + #define ASSERT_MSG(expr, ...) \ + [&] { \ + if (std::is_constant_evaluated()) { \ +@@ -50,13 +55,24 @@ template<typename... Ts> + } \ + } \ + }() ++#endif + ++#ifndef ASSERT_FALSE + #define ASSERT_FALSE(...) ::mcl::detail::assert_terminate("false", __VA_ARGS__) ++#endif + + #if defined(NDEBUG) || defined(MCL_IGNORE_ASSERTS) +-# define DEBUG_ASSERT(expr) ASSUME(expr) +-# define DEBUG_ASSERT_MSG(expr, ...) ASSUME(expr) ++# ifndef DEBUG_ASSERT ++# define DEBUG_ASSERT(expr) ASSUME(expr) ++# endif ++# ifndef DEBUG_ASSERT_MSG ++# define DEBUG_ASSERT_MSG(expr, ...) ASSUME(expr) ++# endif + #else +-# define DEBUG_ASSERT(expr) ASSERT(expr) +-# define DEBUG_ASSERT_MSG(expr, ...) ASSERT_MSG(expr, __VA_ARGS__) ++# ifndef DEBUG_ASSERT ++# define DEBUG_ASSERT(expr) ASSERT(expr) ++# endif ++# ifndef DEBUG_ASSERT_MSG ++# define DEBUG_ASSERT_MSG(expr, ...) ASSERT_MSG(expr, __VA_ARGS__) ++# endif + #endif |