godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-03 18:11:19 +03:00
Code Issues Packages Projects Releases 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
parent 9a25d56b1f b17aa3343a
commit 9052d31c68
55 changed files with 220 additions and 147 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"])