diff options
| author | Fabio Alessandrelli <fabio.alessandrelli@gmail.com> | 2020-05-08 16:55:01 +0200 |
|---|---|---|
| committer | Fabio Alessandrelli <fabio.alessandrelli@gmail.com> | 2020-05-10 18:22:48 +0200 |
| commit | d2eef397312d1c142d95c2aef0ff3d5aeee6495a (patch) | |
| tree | 3d5564f2769337c4eee0899d245b246e526ea542 /platform/javascript/SCsub | |
| parent | 7411e7fd37eb169b0f0675d4e4c2ec28786aec1b (diff) | |
Fix Closure compiler build, python style.
Move copyToFS into utils.js library included with '--pre-js'.
Diffstat (limited to 'platform/javascript/SCsub')
| -rw-r--r-- | platform/javascript/SCsub | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/platform/javascript/SCsub b/platform/javascript/SCsub index 172e15473b..dcf9a46bf9 100644 --- a/platform/javascript/SCsub +++ b/platform/javascript/SCsub @@ -18,18 +18,19 @@ if env["threads_enabled"]: build = env.add_program(build_targets, javascript_files) js_libraries = [ - "http_request.js", + "native/http_request.js", ] for lib in js_libraries: env.Append(LINKFLAGS=["--js-library", env.File(lib).path]) env.Depends(build, js_libraries) -js_modules = [ - "id_handler.js", +js_pre = [ + "native/id_handler.js", + "native/utils.js", ] -for module in js_modules: - env.Append(LINKFLAGS=["--pre-js", env.File(module).path]) -env.Depends(build, js_modules) +for js in js_pre: + env.Append(LINKFLAGS=["--pre-js", env.File(js).path]) +env.Depends(build, js_pre) engine = [ "engine/preloader.js", @@ -49,16 +50,12 @@ js_wrapped = env.Textfile("#bin/godot", [env.File(f) for f in wrap_list], TEXTFI zip_dir = env.Dir("#bin/.javascript_zip") 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") + 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 -] +in_files = [js_wrapped, build[1], html_file] if env["threads_enabled"]: in_files.append(build[2]) out_files.append(zip_dir.File(binary_name + ".worker.js")) @@ -69,5 +66,5 @@ env.Zip( zip_files, ZIPROOT=zip_dir, ZIPSUFFIX="${PROGSUFFIX}${ZIPSUFFIX}", - ZIPCOMSTR="Archving $SOURCES as $TARGET" + ZIPCOMSTR="Archving $SOURCES as $TARGET", ) |