Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-20 00:13:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert "SCons: Add CPPEXTPATH for external includes"

Browse source 
(cherry picked from commit b17aa3343a)
This commit is contained in:
Thaddeus Crews 2025-10-06 11:52:22 -05:00 • committed by Rémi Verschelde
parent 0e179c0e5c
commit 3ac14dfe01
No known key found for this signature in database
GPG key ID: C3336907360768E1
55 changed files with 225 additions and 152 deletions
Download patch file Download diff file Expand all files Collapse all files

8
platform/linuxbsd/detect.py
View file

@ -302,7 +302,7 @@ def configure(env: "SConsEnvironment"):
if not env["builtin_recastnavigation"]:
# No pkgconfig file so far, hardcode default paths.
env.Prepend(CPPEXTPATH=["/usr/include/recastnavigation"])
env.Prepend(CPPPATH=["/usr/include/recastnavigation"])
env.Append(LIBS=["Recast"])
if not env["builtin_embree"] and env["arch"] in ["x86_64", "arm64"]:
@ -414,7 +414,7 @@ def configure(env: "SConsEnvironment"):
env.Prepend(CPPPATH=["#platform/linuxbsd"])
if env["use_sowrap"]:
env.Prepend(CPPEXTPATH=["#thirdparty/linuxbsd_headers"])
env.Prepend(CPPPATH=["#thirdparty/linuxbsd_headers"])
env.Append(
CPPDEFINES=[
@ -476,9 +476,9 @@ def configure(env: "SConsEnvironment"):
sys.exit(255)
env.ParseConfig("pkg-config wayland-egl --cflags --libs")
else:
env.Prepend(CPPEXTPATH=["#thirdparty/linuxbsd_headers/wayland/"])
env.Prepend(CPPPATH=["#thirdparty/linuxbsd_headers/wayland/"])
if env["libdecor"]:
env.Prepend(CPPEXTPATH=["#thirdparty/linuxbsd_headers/libdecor-0/"])
env.Prepend(CPPPATH=["#thirdparty/linuxbsd_headers/libdecor-0/"])
if env["libdecor"]:
env.Append(CPPDEFINES=["LIBDECOR_ENABLED"])