Browse Source
fix moltenvk system find
Signed-off-by: crueter <crueter@eden-emu.dev>
pull/3126/head
crueter
3 weeks ago
No known key found for this signature in database
GPG Key ID: 425ACD2D4830EBC6
2 changed files with
11 additions and
4 deletions
-
externals/CMakeLists.txt
-
externals/cpmfile.json
|
|
|
@ -394,9 +394,15 @@ if (ANDROID) |
|
|
|
endif() |
|
|
|
|
|
|
|
# moltenvk |
|
|
|
if (YUZU_USE_BUNDLED_MOLTENVK) |
|
|
|
if (NOT YUZU_USE_BUNDLED_MOLTENVK) |
|
|
|
find_library(MOLTENVK_LIBRARY MoltenVK) |
|
|
|
else() |
|
|
|
unset(MOLTENVK_LIBRARY) |
|
|
|
endif() |
|
|
|
|
|
|
|
# TODO: kosmickrisp? |
|
|
|
if (NOT MOLTENVK_LIBRARY) |
|
|
|
AddJsonPackage(moltenvk) |
|
|
|
|
|
|
|
list(APPEND CMAKE_PREFIX_PATH "${moltenvk_SOURCE_DIR}/MoltenVK/dylib/macOS") |
|
|
|
set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} PARENT_SCOPE) |
|
|
|
set(MOLTENVK_LIBRARY "${moltenvk_SOURCE_DIR}/MoltenVK/dylib/macOS/libMoltenVK.dylib" CACHE STRING "" FORCE) |
|
|
|
endif() |
|
|
|
@ -216,6 +216,7 @@ |
|
|
|
"tag": "v%VERSION%", |
|
|
|
"git_version": "1.4.1", |
|
|
|
"artifact": "MoltenVK-macOS.tar", |
|
|
|
"hash": "a394329f390a11d1052d2efeef5f7f33860465eea4d7e9e1faf808e616d533a283b9c55074fb833ef95ef40067fc319470eab07dc72ac63e6464dc26cbe34905" |
|
|
|
"hash": "a394329f390a11d1052d2efeef5f7f33860465eea4d7e9e1faf808e616d533a283b9c55074fb833ef95ef40067fc319470eab07dc72ac63e6464dc26cbe34905", |
|
|
|
"bundled": true |
|
|
|
} |
|
|
|
} |
