Revert "SCons: Add CPPEXTPATH for external includes"

This commit is contained in:
Thaddeus Crews
2025-10-06 11:52:22 -05:00
parent d413181b8a
commit b17aa3343a
55 changed files with 220 additions and 147 deletions

View File

@@ -62,9 +62,13 @@ if env["builtin_glslang"]:
thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
# Treat glslang headers as system headers to avoid raising warnings. Not supported on MSVC.
# Include `#thirdparty` to workaround mismatch between location of `SPIRV` in library source
# and in installed public headers.
env_glslang.Prepend(CPPEXTPATH=[thirdparty_dir, "#thirdparty"])
if not env.msvc:
env_glslang.Append(CPPFLAGS=["-isystem", Dir(thirdparty_dir).path, "-isystem", Dir("#thirdparty").path])
else:
env_glslang.Prepend(CPPPATH=[thirdparty_dir, "#thirdparty"])
env_glslang.Append(CPPDEFINES=[("ENABLE_OPT", 0)])