summaryrefslogtreecommitdiff
path: root/platform/javascript/SCsub
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2020-11-23 12:38:17 +0100
committerGitHub <noreply@github.com>2020-11-23 12:38:17 +0100
commit50db0e66ac8c00f176c706cee0c3a5469453acce (patch)
tree8ef45399f10c32b5dad742cf30180b569519cb70 /platform/javascript/SCsub
parent18023cc3ede6fd84842db77019085c383e807016 (diff)
parent4617a7fa9cea323978f14053ef2726c84e9bd267 (diff)
Merge pull request #43747 from Faless/js/4.0_lint
[HTML5] Linting, fixes.
Diffstat (limited to 'platform/javascript/SCsub')
-rw-r--r--platform/javascript/SCsub23
1 files changed, 12 insertions, 11 deletions
diff --git a/platform/javascript/SCsub b/platform/javascript/SCsub
index a0e6fa0e18..627ae778b1 100644
--- a/platform/javascript/SCsub
+++ b/platform/javascript/SCsub
@@ -20,27 +20,28 @@ build = env.add_program(build_targets, javascript_files)
env.AddJSLibraries(
[
- "native/http_request.js",
- "native/library_godot_audio.js",
- "native/library_godot_display.js",
- "native/library_godot_os.js",
+ "js/libs/library_godot_audio.js",
+ "js/libs/library_godot_display.js",
+ "js/libs/library_godot_http_request.js",
+ "js/libs/library_godot_os.js",
+ "js/libs/library_godot_runtime.js",
]
)
if env["tools"]:
- env.AddJSLibraries(["native/library_godot_editor_tools.js"])
+ env.AddJSLibraries(["js/libs/library_godot_editor_tools.js"])
if env["javascript_eval"]:
- env.AddJSLibraries(["native/library_godot_eval.js"])
+ env.AddJSLibraries(["js/libs/library_godot_eval.js"])
for lib in env["JS_LIBS"]:
env.Append(LINKFLAGS=["--js-library", lib])
env.Depends(build, env["JS_LIBS"])
engine = [
- "engine/preloader.js",
- "engine/utils.js",
- "engine/engine.js",
+ "js/engine/preloader.js",
+ "js/engine/utils.js",
+ "js/engine/engine.js",
]
-externs = [env.File("#platform/javascript/engine/externs.js")]
+externs = [env.File("#platform/javascript/js/engine/engine.externs.js")]
js_engine = env.CreateEngineFile("#bin/godot${PROGSUFFIX}.engine.js", engine, externs)
env.Depends(js_engine, externs)
@@ -59,7 +60,7 @@ out_files = [
zip_dir.File(binary_name + ".audio.worklet.js"),
]
html_file = "#misc/dist/html/editor.html" if env["tools"] else "#misc/dist/html/full-size.html"
-in_files = [js_wrapped, build[1], html_file, "#platform/javascript/native/audio.worklet.js"]
+in_files = [js_wrapped, build[1], html_file, "#platform/javascript/js/libs/audio.worklet.js"]
if env["threads_enabled"]:
in_files.append(build[2])
out_files.append(zip_dir.File(binary_name + ".worker.js"))