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

Merge pull request #111331 from Repiteo/scons/revert-cppextpath

Browse source 
Revert "SCons: Add `CPPEXTPATH` for external includes"
This commit is contained in:
Rémi Verschelde 2025-10-07 13:07:19 +02:00
commit 9052d31c68
No known key found for this signature in database
GPG key ID: C3336907360768E1
55 changed files with 220 additions and 147 deletions
Download patch file Download diff file Expand all files Collapse all files

6
modules/openxr/SCsub
View file

@ -29,7 +29,7 @@ elif env["platform"] == "linuxbsd":
if env["wayland"] and env["opengl3"]:
env_openxr.AppendUnique(CPPDEFINES=["XR_USE_PLATFORM_EGL", "XRDEPENDENCIES_USE_GLAD"])
env_openxr.Prepend(CPPEXTPATH=["#thirdparty/glad"])
env_openxr.Prepend(CPPPATH=["#thirdparty/glad"])
# FIXME: Review what needs to be set for Android and macOS.
# FreeBSD uses non-standard getenv functions.
@ -50,7 +50,7 @@ if env["builtin_openxr"]:
thirdparty_dir = "#thirdparty/openxr"
env_openxr.Prepend(
CPPEXTPATH=[
CPPPATH=[
thirdparty_dir,
thirdparty_dir + "/include",
thirdparty_dir + "/src",
@ -66,7 +66,7 @@ if env["builtin_openxr"]:
if env["disable_exceptions"]:
env_thirdparty.AppendUnique(CPPDEFINES=["XRLOADER_DISABLE_EXCEPTION_HANDLING", ("JSON_USE_EXCEPTION", 0)])
env_thirdparty.Append(CPPEXTPATH=[thirdparty_dir + "/src/loader"])
env_thirdparty.Append(CPPPATH=[thirdparty_dir + "/src/loader"])
# add in external jsoncpp dependency
thirdparty_jsoncpp_dir = thirdparty_dir + "/src/external/jsoncpp/src/lib_json/"