diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2016-12-02 08:57:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-02 08:57:33 +0100 |
| commit | 752f630f4e5bf17019de66cf2b0f33cf419ab525 (patch) | |
| tree | 2706b1a11ec827db93938c5c78a6a860cb093e61 /platform/javascript | |
| parent | fb932d0f504c1c0c74202424030904ba20a99854 (diff) | |
| parent | 290d79f26c0c6cd00a35ae64fb6eecacedbb3937 (diff) | |
Merge pull request #7219 from eska014/separate-asmjs
Fix browser lockups in web export startup
Diffstat (limited to 'platform/javascript')
| -rw-r--r-- | platform/javascript/detect.py | 1 | ||||
| -rw-r--r-- | platform/javascript/export/export.cpp | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/platform/javascript/detect.py b/platform/javascript/detect.py index 35352becf8..2cb6874000 100644 --- a/platform/javascript/detect.py +++ b/platform/javascript/detect.py @@ -96,6 +96,7 @@ def configure(env): else: env.Append(CPPFLAGS=['-s', 'ASM_JS=1']) env.Append(LINKFLAGS=['-s', 'ASM_JS=1']) + env.Append(LINKFLAGS=['--separate-asm']) if env['javascript_eval'] == 'yes': env.Append(CPPFLAGS=['-DJAVASCRIPT_EVAL_ENABLED']) diff --git a/platform/javascript/export/export.cpp b/platform/javascript/export/export.cpp index 721aef3e50..ab64ffbb45 100644 --- a/platform/javascript/export/export.cpp +++ b/platform/javascript/export/export.cpp @@ -320,6 +320,11 @@ Error EditorExportPlatformJavaScript::export_project(const String& p_path, bool file=p_path.get_file().basename()+".js"; } + if (file=="godot.asm.js") { + + file=p_path.get_file().basename()+".asm.js"; + } + if (file=="godot.mem") { file=p_path.get_file().basename()+".mem"; |