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

Merge pull request #105709 from bruvzg/angle_no_vlk

Browse Source 
Fix macOS build with ANGLE enabled and Vulkan disabled.
This commit is contained in:
Thaddeus Crews
2025-04-24 09:09:28 -05:00
parent d3ae45df94 e096e2fa8a
commit 240cf0d60a
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
platform/macos/detect.py
View File

@ -235,6 +235,8 @@ def configure(env: "SConsEnvironment"):
)
env.Append(LIBS=["pthread", "z"])
extra_frameworks = set()
if env["opengl3"]:
env.Append(CPPDEFINES=["GLES3_ENABLED"])
if env["angle_libs"] != "":
@ -243,6 +245,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"]])
extra_frameworks.add("IOSurface")
env.Prepend(CPPEXTPATH=["#thirdparty/angle/include"])
env.Append(LINKFLAGS=["-rpath", "@executable_path/../Frameworks", "-rpath", "@executable_path"])
@ -251,8 +254,6 @@ def configure(env: "SConsEnvironment"):
print_warning("Target architecture '{}' does not support the Metal rendering driver".format(env["arch"]))
env["metal"] = False
extra_frameworks = set()
if env["metal"]:
env.AppendUnique(CPPDEFINES=["METAL_ENABLED", "RD_ENABLED"])
extra_frameworks.add("Metal")