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

Merge pull request #74527 from ronyeh/master 

Rename mkv_list to mvk_list (MoltenVK path list).
This commit is contained in:
Rémi Verschelde 2023-03-07 10:34:18 +01:00
parent ff58c41193 7e7ac1bb87
commit 1047411286
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
platform/macos/detect.py
View File

@ -242,17 +242,17 @@ def configure(env: "Environment"):
env.Append(LINKFLAGS=["-lMoltenVK"]) env.Append(LINKFLAGS=["-lMoltenVK"])
mvk_found = False mvk_found = False
mkv_list = [get_mvk_sdk_path(), "/opt/homebrew/lib", "/usr/local/homebrew/lib", "/opt/local/lib"] mvk_list = [get_mvk_sdk_path(), "/opt/homebrew/lib", "/usr/local/homebrew/lib", "/opt/local/lib"]
if env["vulkan_sdk_path"] != "": if env["vulkan_sdk_path"] != "":
mkv_list.insert(0, os.path.expanduser(env["vulkan_sdk_path"])) mvk_list.insert(0, os.path.expanduser(env["vulkan_sdk_path"]))
mkv_list.insert( mvk_list.insert(
0, 0,
os.path.join( os.path.join(
os.path.expanduser(env["vulkan_sdk_path"]), "MoltenVK/MoltenVK.xcframework/macos-arm64_x86_64/" os.path.expanduser(env["vulkan_sdk_path"]), "MoltenVK/MoltenVK.xcframework/macos-arm64_x86_64/"
), ),
) )
for mvk_path in mkv_list: for mvk_path in mvk_list:
if mvk_path and 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
print("MoltenVK found at: " + mvk_path) print("MoltenVK found at: " + mvk_path)