From 2939aabf164c1bfb698829d3af1de2d7f495e5a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pa=CC=84vels=20Nadtoc=CC=8Cajevs?= <7645683+bruvzg@users.noreply.github.com> Date: Tue, 7 Apr 2026 22:37:06 +0300 Subject: [PATCH] [ANGLE] Fix build with manually set path. --- platform/macos/detect.py | 3 ++- platform/windows/detect.py | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/platform/macos/detect.py b/platform/macos/detect.py index df7375880073..2b67ccb58d2b 100644 --- a/platform/macos/detect.py +++ b/platform/macos/detect.py @@ -284,7 +284,8 @@ def configure(env: "SConsEnvironment"): env.Append(CPPDEFINES=["GLES3_ENABLED"]) if env["angle"]: angle_path = env["angle_libs"] + "-" + env["arch"] + "-macos" - print(angle_path) + if not os.path.exists(angle_path): + angle_path = env["angle_libs"] if os.path.exists(angle_path): env.Prepend(CPPPATH=["#thirdparty/angle/include"]) env.AppendUnique(CPPDEFINES=["ANGLE_ENABLED", "EGL_STATIC"]) diff --git a/platform/windows/detect.py b/platform/windows/detect.py index 8ca94fbdec8a..35cb2fe25fc8 100644 --- a/platform/windows/detect.py +++ b/platform/windows/detect.py @@ -496,6 +496,8 @@ def spawn_capture(sh, escape, cmd, args, env): if env["opengl3"]: env.AppendUnique(CPPDEFINES=["GLES3_ENABLED"]) angle_path = env["angle_libs"] + "-" + env["arch"] + "-msvc" + if not os.path.exists(angle_path): + angle_path = env["angle_libs"] if os.path.exists(angle_path): env.Prepend(CPPPATH=["#thirdparty/angle/include"]) env.AppendUnique(CPPDEFINES=["ANGLE_ENABLED", "EGL_STATIC"]) @@ -931,6 +933,8 @@ def configure_mingw(env: "SConsEnvironment"): env.Append(CPPDEFINES=["GLES3_ENABLED"]) if env["angle"]: angle_path = env["angle_libs"] + "-" + env["arch"] + ("-llvm" if env["use_llvm"] else "-gcc") + if not os.path.exists(angle_path): + angle_path = env["angle_libs"] if os.path.exists(angle_path): env.Prepend(CPPPATH=["#thirdparty/angle/include"]) env.AppendUnique(CPPDEFINES=["ANGLE_ENABLED", "EGL_STATIC"])