Merge pull request #7219 from eska014/separate-asmjs
Fix browser lockups in web export startup
This commit is contained in:
commit
752f630f4e
2 changed files with 6 additions and 0 deletions
|
@ -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'])
|
||||
|
|
|
@ -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";
|
||||
|
|
Loading…
Reference in a new issue