seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #104893 from Repiteo/scons/external-includes-alt

Browse Source 
SCons: Add `CPPEXTPATH` for external includes
This commit is contained in:
Thaddeus Crews
2025-04-02 07:48:03 -05:00
committed by GitHub
parent c9c8556a47 f25fc34439
commit 1f56d96cf2
55 changed files with 141 additions and 290 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
platform/windows/detect.py
View File

@ -461,7 +461,7 @@ def configure_msvc(env: "SConsEnvironment"):
"libGLES.windows." + env["arch"] + prebuilt_lib_extra_suffix,
]
LIBS += ["dxgi", "d3d9", "d3d11"]
env.Prepend(CPPPATH=["#thirdparty/angle/include"])
env.Prepend(CPPEXTPATH=["#thirdparty/angle/include"])
if env["target"] in ["editor", "template_debug"]:
LIBS += ["psapi", "dbghelp"]
@ -808,7 +808,7 @@ def configure_mingw(env: "SConsEnvironment"):
]
)
env.Append(LIBS=["dxgi", "d3d9", "d3d11"])
env.Prepend(CPPPATH=["#thirdparty/angle/include"])
env.Prepend(CPPEXTPATH=["#thirdparty/angle/include"])
env.Append(CPPDEFINES=["MINGW_ENABLED", ("MINGW_HAS_SECURE_API", 1)])