Skip to content

Commit 240cf0d

Browse files
committed
Merge pull request #105709 from bruvzg/angle_no_vlk
Fix macOS build with ANGLE enabled and Vulkan disabled.
2 parents d3ae45d + e096e2f commit 240cf0d

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

platform/macos/detect.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,8 @@ def configure(env: "SConsEnvironment"):
235235
)
236236
env.Append(LIBS=["pthread", "z"])
237237

238+
extra_frameworks = set()
239+
238240
if env["opengl3"]:
239241
env.Append(CPPDEFINES=["GLES3_ENABLED"])
240242
if env["angle_libs"] != "":
@@ -243,6 +245,7 @@ def configure(env: "SConsEnvironment"):
243245
env.Append(LINKFLAGS=["-lANGLE.macos." + env["arch"]])
244246
env.Append(LINKFLAGS=["-lEGL.macos." + env["arch"]])
245247
env.Append(LINKFLAGS=["-lGLES.macos." + env["arch"]])
248+
extra_frameworks.add("IOSurface")
246249
env.Prepend(CPPEXTPATH=["#thirdparty/angle/include"])
247250

248251
env.Append(LINKFLAGS=["-rpath", "@executable_path/../Frameworks", "-rpath", "@executable_path"])
@@ -251,8 +254,6 @@ def configure(env: "SConsEnvironment"):
251254
print_warning("Target architecture '{}' does not support the Metal rendering driver".format(env["arch"]))
252255
env["metal"] = False
253256

254-
extra_frameworks = set()
255-
256257
if env["metal"]:
257258
env.AppendUnique(CPPDEFINES=["METAL_ENABLED", "RD_ENABLED"])
258259
extra_frameworks.add("Metal")

0 commit comments

Comments
 (0)