aboutsummaryrefslogtreecommitdiff
path: root/platform/javascript
diff options
context:
space:
mode:
Diffstat (limited to 'platform/javascript')
-rw-r--r--platform/javascript/detect.py1
-rw-r--r--platform/javascript/export/export.cpp6
2 files changed, 7 insertions, 0 deletions
diff --git a/platform/javascript/detect.py b/platform/javascript/detect.py
index 2ac12c5f6..5390e9bee 100644
--- a/platform/javascript/detect.py
+++ b/platform/javascript/detect.py
@@ -91,6 +91,7 @@ def configure(env):
env.Append(LINKFLAGS=['--compression', lzma_binpath + "," + lzma_decoder + "," + lzma_dec])
env.Append(LINKFLAGS=['-s', 'ASM_JS=1'])
+ env.Append(LINKFLAGS=['--separate-asm'])
env.Append(LINKFLAGS=['-O2'])
# env.Append(LINKFLAGS=['-g4'])
diff --git a/platform/javascript/export/export.cpp b/platform/javascript/export/export.cpp
index f934916aa..bcc02f3ba 100644
--- a/platform/javascript/export/export.cpp
+++ b/platform/javascript/export/export.cpp
@@ -183,6 +183,7 @@ void EditorExportPlatformJavaScript::_fix_html(Vector<uint8_t>& p_html, const St
current_line = current_line.replace("$GODOT_FS",p_name+"fs.js");
current_line = current_line.replace("$GODOT_MEM",p_name+".mem");
current_line = current_line.replace("$GODOT_JS",p_name+".js");
+ current_line = current_line.replace("$GODOT_ASM",p_name+".asm.js");
current_line = current_line.replace("$GODOT_CANVAS_WIDTH",Globals::get_singleton()->get("display/width"));
current_line = current_line.replace("$GODOT_CANVAS_HEIGHT",Globals::get_singleton()->get("display/height"));
current_line = current_line.replace("$GODOT_HEAD_TITLE",!html_title.empty()?html_title:(String) Globals::get_singleton()->get("application/name"));
@@ -323,6 +324,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") {
//_fix_godot(data);