Merge pull request #105800 from adamscott/add-emscripten-include-path
[Web] Include emscripten headers by default
This commit is contained in:
commit
e0072e9169
@ -1,5 +1,6 @@
|
|||||||
import os
|
import os
|
||||||
import sys
|
import sys
|
||||||
|
from pathlib import Path
|
||||||
from typing import TYPE_CHECKING
|
from typing import TYPE_CHECKING
|
||||||
|
|
||||||
from emscripten_helpers import (
|
from emscripten_helpers import (
|
||||||
@ -115,6 +116,14 @@ def configure(env: "SConsEnvironment"):
|
|||||||
print_error("Initial memory must be a valid integer")
|
print_error("Initial memory must be a valid integer")
|
||||||
sys.exit(255)
|
sys.exit(255)
|
||||||
|
|
||||||
|
# Add Emscripten to the included paths (for compile_commands.json completion)
|
||||||
|
emcc_path = Path(str(WhereIs("emcc")))
|
||||||
|
while emcc_path.is_symlink():
|
||||||
|
# For some reason, mypy trips on `Path.readlink` not being defined, somehow.
|
||||||
|
emcc_path = emcc_path.readlink() # type: ignore[attr-defined]
|
||||||
|
emscripten_include_path = emcc_path.parent.joinpath("cache", "sysroot", "include")
|
||||||
|
env.Append(CPPPATH=[emscripten_include_path])
|
||||||
|
|
||||||
## Build type
|
## Build type
|
||||||
|
|
||||||
if env.debug_features:
|
if env.debug_features:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user