diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-05-04 08:17:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-04 08:17:43 +0200 |
| commit | ed5e0499ff9b043e52086d6e29031b3ab9c9ca32 (patch) | |
| tree | dc5168f7d71097fa5cdf81e5f1fd73f3d617478a | |
| parent | 1b2992799b324479b3fba9e05ae6226a46cb4143 (diff) | |
| parent | 070bd87aaaf7a15ad9d2d839182f14d5c352153b (diff) | |
Merge pull request #60734 from Faless/js/4.x_sig_other_sig
[HTML5] Disable zstd weak symbols, add missing JS signature.
| -rw-r--r-- | platform/javascript/detect.py | 2 | ||||
| -rw-r--r-- | platform/javascript/js/libs/library_godot_display.js | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/platform/javascript/detect.py b/platform/javascript/detect.py index b6be44fbb2..709104c5ee 100644 --- a/platform/javascript/detect.py +++ b/platform/javascript/detect.py @@ -212,6 +212,8 @@ def configure(env): sys.exit(255) env.Append(CCFLAGS=["-s", "RELOCATABLE=1"]) env.Append(LINKFLAGS=["-s", "RELOCATABLE=1"]) + # Weak symbols are broken upstream: https://github.com/emscripten-core/emscripten/issues/12819 + env.Append(CPPDEFINES=["ZSTD_HAVE_WEAK_SYMBOLS=0"]) env.extra_suffix = ".gdnative" + env.extra_suffix # Reduce code size by generating less support code (e.g. skip NodeJS support). diff --git a/platform/javascript/js/libs/library_godot_display.js b/platform/javascript/js/libs/library_godot_display.js index 54d48643db..5997631bf8 100644 --- a/platform/javascript/js/libs/library_godot_display.js +++ b/platform/javascript/js/libs/library_godot_display.js @@ -462,6 +462,7 @@ const GodotDisplay = { GodotRuntime.setHeapValue(height, window.screen.height * scale, 'i32'); }, + godot_js_display_window_size_get__sig: 'vii', godot_js_display_window_size_get: function (p_width, p_height) { GodotRuntime.setHeapValue(p_width, GodotConfig.canvas.width, 'i32'); GodotRuntime.setHeapValue(p_height, GodotConfig.canvas.height, 'i32'); |