diff options
| author | Yuri Sizov <11782833+YuriSizov@users.noreply.github.com> | 2023-03-27 20:14:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-27 20:14:47 +0200 |
| commit | 19501f8eb19481b029f67ecf78e711d42f2fc431 (patch) | |
| tree | 933ea3320b35bce6ba65ab1e1d1aa8ad662c90d4 /platform/macos/detect.py | |
| parent | cacf49999e3fb37281d66cc591ca8bebc5712d4d (diff) | |
| parent | 843f5adbc523ad2511322b4f09b5ce5a3fb9e225 (diff) | |
Merge pull request #75397 from YuriSizov/4.0-cherrypicks
Cherry-picks for the 4.0 branch (future 4.0.2) - 1st batch
Diffstat (limited to 'platform/macos/detect.py')
| -rw-r--r-- | platform/macos/detect.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/platform/macos/detect.py b/platform/macos/detect.py index cd46dab4f3..e3c1f17b8f 100644 --- a/platform/macos/detect.py +++ b/platform/macos/detect.py @@ -242,17 +242,17 @@ def configure(env: "Environment"): env.Append(LINKFLAGS=["-lMoltenVK"]) 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"] != "": - mkv_list.insert(0, os.path.expanduser(env["vulkan_sdk_path"])) - mkv_list.insert( + mvk_list.insert(0, os.path.expanduser(env["vulkan_sdk_path"])) + mvk_list.insert( 0, os.path.join( 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")): mvk_found = True print("MoltenVK found at: " + mvk_path) |