From 042243471fb7ecf6ba5e53f0ba35e825a8bb066a Mon Sep 17 00:00:00 2001 From: Sam Clegg Date: Wed, 5 Jul 2023 13:52:37 -0700 Subject: [PATCH] emscripten: Add JS library dependencies using EM_JS_DEPS macro See https://github.com/emscripten-core/emscripten/pull/19780 --- .github/workflows/emscripten.yml | 2 +- docs/README-emscripten.md | 2 +- src/audio/emscripten/SDL_emscriptenaudio.c | 2 ++ src/misc/emscripten/SDL_sysurl.c | 8 +++----- src/video/emscripten/SDL_emscriptenmouse.c | 2 ++ 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/emscripten.yml b/.github/workflows/emscripten.yml index 56f77b6ce..f3f65ebf8 100644 --- a/.github/workflows/emscripten.yml +++ b/.github/workflows/emscripten.yml @@ -9,7 +9,7 @@ jobs: - uses: actions/checkout@v3 - uses: mymindstorm/setup-emsdk@v10 with: - version: 2.0.32 + version: 3.1.35 - name: Install ninja run: | sudo apt-get -y update diff --git a/docs/README-emscripten.md b/docs/README-emscripten.md index 5f8c27786..147e18d8e 100644 --- a/docs/README-emscripten.md +++ b/docs/README-emscripten.md @@ -38,7 +38,7 @@ for some Javascript code to steal for this approach. ## Building SDL/emscripten -SDL currently requires at least Emscripten 2.0.32 to build. Newer versions +SDL currently requires at least Emscripten 3.1.35 to build. Newer versions are likely to work, as well. diff --git a/src/audio/emscripten/SDL_emscriptenaudio.c b/src/audio/emscripten/SDL_emscriptenaudio.c index af5f09565..341c9dfcd 100644 --- a/src/audio/emscripten/SDL_emscriptenaudio.c +++ b/src/audio/emscripten/SDL_emscriptenaudio.c @@ -197,6 +197,8 @@ static void EMSCRIPTENAUDIO_CloseDevice(_THIS) #endif } +EM_JS_DEPS(sdlaudio, "$autoResumeAudioContext,$dynCall"); + static int EMSCRIPTENAUDIO_OpenDevice(_THIS, const char *devname) { SDL_AudioFormat test_format; diff --git a/src/misc/emscripten/SDL_sysurl.c b/src/misc/emscripten/SDL_sysurl.c index 12cb156a7..1d707fc1a 100644 --- a/src/misc/emscripten/SDL_sysurl.c +++ b/src/misc/emscripten/SDL_sysurl.c @@ -23,13 +23,11 @@ #include +EM_JS_DEPS(sdlsysurl, "$UTF8ToString"); + int SDL_SYS_OpenURL(const char *url) { - EM_ASM({ - window.open(UTF8ToString($0), "_blank"); - }, - url); - + EM_ASM(window.open(UTF8ToString($0), "_blank"), url); return 0; } diff --git a/src/video/emscripten/SDL_emscriptenmouse.c b/src/video/emscripten/SDL_emscriptenmouse.c index 822995c4b..7dea22b24 100644 --- a/src/video/emscripten/SDL_emscriptenmouse.c +++ b/src/video/emscripten/SDL_emscriptenmouse.c @@ -60,6 +60,8 @@ static SDL_Cursor *Emscripten_CreateDefaultCursor() return Emscripten_CreateCursorFromString("default", SDL_FALSE); } +EM_JS_DEPS(sdlmouse, "$stringToUTF8,$UTF8ToString"); + static SDL_Cursor *Emscripten_CreateCursor(SDL_Surface *surface, int hot_x, int hot_y) { const char *cursor_url = NULL;