asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #7219 from eska014/separate-asmjs

Browse source 
Fix browser lockups in web export startup
This commit is contained in:
Rémi Verschelde 2016-12-02 08:57:33 +01:00 committed by GitHub
commit 752f630f4e
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
platform/javascript/detect.py
View file

@ -96,6 +96,7 @@ def configure(env):
else: else:
env.Append(CPPFLAGS=['-s', 'ASM_JS=1']) env.Append(CPPFLAGS=['-s', 'ASM_JS=1'])
env.Append(LINKFLAGS=['-s', 'ASM_JS=1']) env.Append(LINKFLAGS=['-s', 'ASM_JS=1'])
env.Append(LINKFLAGS=['--separate-asm'])
if env['javascript_eval'] == 'yes': if env['javascript_eval'] == 'yes':
env.Append(CPPFLAGS=['-DJAVASCRIPT_EVAL_ENABLED']) env.Append(CPPFLAGS=['-DJAVASCRIPT_EVAL_ENABLED'])

5
platform/javascript/export/export.cpp
View file

@ -320,6 +320,11 @@ Error EditorExportPlatformJavaScript::export_project(const String& p_path, bool
file=p_path.get_file().basename()+".js"; file=p_path.get_file().basename()+".js";
} }
if (file=="godot.asm.js") {
file=p_path.get_file().basename()+".asm.js";
}
if (file=="godot.mem") { if (file=="godot.mem") {
file=p_path.get_file().basename()+".mem"; file=p_path.get_file().basename()+".mem";