Explorar el Código

[HTML5] Use absolute path for JS lib/pre/externs.

Ensure better compatibility when emcc which may run some tools from
different paths (e.g. closure compiler).

This fixes externs include issues with modern emcc using the closure
compiler.
Fabio Alessandrelli hace 3 años
padre
commit
eaedc92c61
Se han modificado 1 ficheros con 3 adiciones y 3 borrados
  1. 3 3
      platform/javascript/SCsub

+ 3 - 3
platform/javascript/SCsub

@@ -28,11 +28,11 @@ if env["javascript_eval"]:
     sys_env.AddJSLibraries(["js/libs/library_godot_javascript_singleton.js"])
 
 for lib in sys_env["JS_LIBS"]:
-    sys_env.Append(LINKFLAGS=["--js-library", lib])
+    sys_env.Append(LINKFLAGS=["--js-library", lib.abspath])
 for js in env["JS_PRE"]:
-    sys_env.Append(LINKFLAGS=["--pre-js", env.File(js).path])
+    sys_env.Append(LINKFLAGS=["--pre-js", js.abspath])
 for ext in env["JS_EXTERNS"]:
-    sys_env["ENV"]["EMCC_CLOSURE_ARGS"] += " --externs " + ext.path
+    sys_env["ENV"]["EMCC_CLOSURE_ARGS"] += " --externs " + ext.abspath
 
 build = []
 if env["gdnative_enabled"]: