From 7411e7fd37eb169b0f0675d4e4c2ec28786aec1b Mon Sep 17 00:00:00 2001
From: Fabio Alessandrelli <fabio.alessandrelli@gmail.com>
Date: Fri, 1 May 2020 14:45:45 +0200
Subject: DisplayServerJavaScript implementation.

---
 platform/javascript/SCsub | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

(limited to 'platform/javascript/SCsub')

diff --git a/platform/javascript/SCsub b/platform/javascript/SCsub
index 48f9ee4b76..172e15473b 100644
--- a/platform/javascript/SCsub
+++ b/platform/javascript/SCsub
@@ -4,6 +4,7 @@ Import("env")
 
 javascript_files = [
     "audio_driver_javascript.cpp",
+    "display_server_javascript.cpp",
     "http_client_javascript.cpp",
     "javascript_eval.cpp",
     "javascript_main.cpp",
@@ -46,11 +47,21 @@ wrap_list = [
 js_wrapped = env.Textfile("#bin/godot", [env.File(f) for f in wrap_list], TEXTFILESUFFIX="${PROGSUFFIX}.wrapped.js")
 
 zip_dir = env.Dir("#bin/.javascript_zip")
-out_files = [zip_dir.File("godot.js"), zip_dir.File("godot.wasm"), zip_dir.File("godot.html")]
-in_files = [js_wrapped, build[1], "#misc/dist/html/full-size.html"]
+binary_name = "godot.tools" if env["tools"] else "godot"
+out_files = [
+        zip_dir.File(binary_name + ".js"),
+        zip_dir.File(binary_name + ".wasm"),
+        zip_dir.File(binary_name + ".html")
+]
+html_file = "#misc/dist/html/full-size.html"
+in_files = [
+        js_wrapped,
+        build[1],
+        html_file
+]
 if env["threads_enabled"]:
     in_files.append(build[2])
-    out_files.append(zip_dir.File("godot.worker.js"))
+    out_files.append(zip_dir.File(binary_name + ".worker.js"))
 
 zip_files = env.InstallAs(out_files, in_files)
 env.Zip(
@@ -58,5 +69,5 @@ env.Zip(
     zip_files,
     ZIPROOT=zip_dir,
     ZIPSUFFIX="${PROGSUFFIX}${ZIPSUFFIX}",
-    ZIPCOMSTR="Archving $SOURCES as $TARGET",
+    ZIPCOMSTR="Archving $SOURCES as $TARGET"
 )
-- 
cgit v1.2.3