Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-01 06:01:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

[HTML5] Scons now expects "emcc" to be in PATH.

Browse source 
No longer parse emscripten/emsdk config to detect emcc/node paths.
Use WhereIs to find "emcc" and "node", look for "node_modules" in "emcc"
path.

(cherry picked from commit 7998745237)
This commit is contained in:
Fabio Alessandrelli 2020-10-03 15:46:52 +02:00 • committed by Rémi Verschelde
parent 6c4a02479d
commit 2d5f9c53b0
No known key found for this signature in database
GPG key ID: C3336907360768E1
2 changed files with 6 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

8
platform/javascript/detect.py
View file

@ -1,6 +1,7 @@
import os
from emscripten_helpers import parse_config, run_closure_compiler, create_engine_file
from emscripten_helpers import run_closure_compiler, create_engine_file
from SCons.Util import WhereIs
def is_active():
@ -12,7 +13,7 @@ def get_name():
def can_build():
return "EM_CONFIG" in os.environ or os.path.exists(os.path.expanduser("~/.emscripten"))
return WhereIs("emcc") is not None
def get_opts():
@ -100,9 +101,6 @@ def configure(env):
# Closure compiler extern and support for ecmascript specs (const, let, etc).
env["ENV"]["EMCC_CLOSURE_ARGS"] = "--language_in ECMASCRIPT6"
em_config = parse_config()
env.PrependENVPath("PATH", em_config["EMCC_ROOT"])
env["CC"] = "emcc"
env["CXX"] = "em++"
env["LINK"] = "emcc"