diff options
| author | Nils ANDRÉ-CHANG <nils@nilsand.re> | 2019-09-12 21:28:49 +0100 |
|---|---|---|
| committer | Nils ANDRÉ-CHANG <nils@nilsand.re> | 2019-09-26 20:36:12 +0100 |
| commit | 0024dd7bb5a8a5194ed0283fc506edcd8b4a7737 (patch) | |
| tree | 86316cccbf4fda58a275a7451e37fda83465bb20 /platform/javascript/detect.py | |
| parent | cafb888361eba08297dd88b18dc71f4d418525c0 (diff) | |
| parent | 24e1039eb6fe32115e8d1a62a84965e9be19a2ed (diff) | |
| download | redot-engine-0024dd7bb5a8a5194ed0283fc506edcd8b4a7737.tar.gz | |
Merge branch 'master' into tab_key
Diffstat (limited to 'platform/javascript/detect.py')
| -rw-r--r-- | platform/javascript/detect.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/platform/javascript/detect.py b/platform/javascript/detect.py index 10680ad1f5..a0d6ac9214 100644 --- a/platform/javascript/detect.py +++ b/platform/javascript/detect.py @@ -128,7 +128,6 @@ def configure(env): ## Link flags env.Append(LINKFLAGS=['-s', 'BINARYEN=1']) - env.Append(LINKFLAGS=['-s', 'BINARYEN_TRAP_MODE=\'clamp\'']) # Allow increasing memory buffer size during runtime. This is efficient # when using WebAssembly (in comparison to asm.js) and works well for @@ -142,3 +141,6 @@ def configure(env): # TODO: Reevaluate usage of this setting now that engine.js manages engine runtime. env.Append(LINKFLAGS=['-s', 'NO_EXIT_RUNTIME=1']) + + #adding flag due to issue with emscripten 1.38.41 callMain method https://github.com/emscripten-core/emscripten/blob/incoming/ChangeLog.md#v13841-08072019 + env.Append(LINKFLAGS=['-s', 'EXTRA_EXPORTED_RUNTIME_METHODS=["callMain"]']) |