asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #65024 from yedpodtrzitko/yed/fix-macos-missing-vulkan

Browse source 
fix: graceful exit on macOS with missing Vulkan SDK
This commit is contained in:
Rémi Verschelde 2022-09-04 16:02:07 +02:00 committed by GitHub
commit 733e0be8ec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
platform/macos/detect.py
View file

@ -54,11 +54,13 @@ def get_mvk_sdk_path():
return [int_or_zero(i) for i in a.split(".")] return [int_or_zero(i) for i in a.split(".")]
dirname = os.path.expanduser("~/VulkanSDK") dirname = os.path.expanduser("~/VulkanSDK")
files = os.listdir(dirname) if not os.path.exists(dirname):
return ""
ver_file = "0.0.0.0" ver_file = "0.0.0.0"
ver_num = ver_parse(ver_file) ver_num = ver_parse(ver_file)
files = os.listdir(dirname)
for file in files: for file in files:
if os.path.isdir(os.path.join(dirname, file)): if os.path.isdir(os.path.join(dirname, file)):
ver_comp = ver_parse(file) ver_comp = ver_parse(file)
@ -145,7 +147,7 @@ def configure(env):
env.Append(LINKFLAGS=["-isysroot", "$MACOS_SDK_PATH"]) env.Append(LINKFLAGS=["-isysroot", "$MACOS_SDK_PATH"])
else: # osxcross build else: # osxcross build
root = os.environ.get("OSXCROSS_ROOT", 0) root = os.environ.get("OSXCROSS_ROOT", "")
if env["arch"] == "arm64": if env["arch"] == "arm64":
basecmd = root + "/target/bin/arm64-apple-" + env["osxcross_sdk"] + "-" basecmd = root + "/target/bin/arm64-apple-" + env["osxcross_sdk"] + "-"
else: else:
@ -248,7 +250,7 @@ def configure(env):
env.Append(LINKFLAGS=["-L" + mvk_path]) env.Append(LINKFLAGS=["-L" + mvk_path])
if not mvk_found: if not mvk_found:
mvk_path = get_mvk_sdk_path() mvk_path = get_mvk_sdk_path()
if os.path.isfile(os.path.join(mvk_path, "libMoltenVK.a")): if mvk_path and os.path.isfile(os.path.join(mvk_path, "libMoltenVK.a")):
mvk_found = True mvk_found = True
env.Append(LINKFLAGS=["-L" + mvk_path]) env.Append(LINKFLAGS=["-L" + mvk_path])
if not mvk_found: if not mvk_found: