summaryrefslogtreecommitdiff
path: root/platform/javascript/export
diff options
context:
space:
mode:
authoreska <eska@eska.me>2016-11-30 22:47:19 +0100
committereska <eska@eska.me>2016-11-30 23:47:38 +0100
commit290d79f26c0c6cd00a35ae64fb6eecacedbb3937 (patch)
tree287da1004eecc7599bcc987d07db8c0bf170cb1b /platform/javascript/export
parentd5c6806e16c5d809c749b999ae91ae22dc25348e (diff)
Emit asm.js code into a dedicated file for asm.js export
This helps prevent browser lockups during start-up at the cost of having to distribute an extra file.
Diffstat (limited to 'platform/javascript/export')
-rw-r--r--platform/javascript/export/export.cpp5
1 files changed, 5 insertions, 0 deletions
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";