From 5008521538ffe7931ecd0d11c4a5e75a05f54b5b Mon Sep 17 00:00:00 2001
From: "Ryan C. Gordon" <[EMAIL REDACTED]>
Date: Wed, 20 Sep 2023 14:32:41 -0400
Subject: [PATCH] emscripten: Restore compatibility with existing emsdk
releases.
---
src/SDL_assert.c | 12 ++++++++++--
src/video/emscripten/SDL_emscriptenmouse.c | 9 +++++++++
2 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/src/SDL_assert.c b/src/SDL_assert.c
index 15e793dd61e4..ba1c194d9c76 100644
--- a/src/SDL_assert.c
+++ b/src/SDL_assert.c
@@ -34,7 +34,15 @@
#endif
#ifdef __EMSCRIPTEN__
-#include <emscripten.h>
+ #include <emscripten.h>
+ /* older Emscriptens don't have this, but we need to for wasm64 compatibility. */
+ #ifndef MAIN_THREAD_EM_ASM_PTR
+ #ifdef __wasm64__
+ #error You need to upgrade your Emscripten compiler to support wasm64
+ #else
+ #define MAIN_THREAD_EM_ASM_PTR MAIN_THREAD_EM_ASM_INT
+ #endif
+ #endif
#endif
/* The size of the stack buffer to use for rendering assert messages. */
@@ -243,7 +251,7 @@ static SDL_AssertState SDLCALL SDL_PromptAssertion(const SDL_AssertData *data, v
for (;;) {
SDL_bool okay = SDL_TRUE;
/* *INDENT-OFF* */ /* clang-format off */
- char *buf = (char *) EM_ASM_PTR({
+ char *buf = (char *) MAIN_THREAD_EM_ASM_PTR({
var str =
UTF8ToString($0) + '\n\n' +
'Abort/Retry/Ignore/AlwaysIgnore? [ariA] :';
diff --git a/src/video/emscripten/SDL_emscriptenmouse.c b/src/video/emscripten/SDL_emscriptenmouse.c
index 678f6c3fc6c1..9aa794674ced 100644
--- a/src/video/emscripten/SDL_emscriptenmouse.c
+++ b/src/video/emscripten/SDL_emscriptenmouse.c
@@ -31,6 +31,15 @@
#include "../../events/SDL_mouse_c.h"
+/* older Emscriptens don't have this, but we need to for wasm64 compatibility. */
+#ifndef MAIN_THREAD_EM_ASM_PTR
+ #ifdef __wasm64__
+ #error You need to upgrade your Emscripten compiler to support wasm64
+ #else
+ #define MAIN_THREAD_EM_ASM_PTR MAIN_THREAD_EM_ASM_INT
+ #endif
+#endif
+
static SDL_Cursor *Emscripten_CreateCursorFromString(const char *cursor_str, SDL_bool is_custom)
{
SDL_Cursor *cursor;