Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-19 16:03:29 +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

4
platform/macos/detect.py
View file

@ -251,7 +251,7 @@ def configure(env: "SConsEnvironment"):
env.Append(LINKFLAGS=["-lANGLE.macos." + env["arch"]])
env.Append(LINKFLAGS=["-lEGL.macos." + env["arch"]])
env.Append(LINKFLAGS=["-lGLES.macos." + env["arch"]])
env.Prepend(CPPEXTPATH=["#thirdparty/angle/include"])
env.Prepend(CPPPATH=["#thirdparty/angle/include"])
env.Append(LINKFLAGS=["-rpath", "@executable_path/../Frameworks", "-rpath", "@executable_path"])
@ -264,7 +264,7 @@ def configure(env: "SConsEnvironment"):
extra_frameworks.add("Metal")
extra_frameworks.add("MetalKit")
extra_frameworks.add("MetalFX")
env.Prepend(CPPEXTPATH=["#thirdparty/spirv-cross"])
env.Prepend(CPPPATH=["#thirdparty/spirv-cross"])
if env["vulkan"]:
env.AppendUnique(CPPDEFINES=["VULKAN_ENABLED", "RD_ENABLED"])