diff options
| author | ruki <[email protected]> | 2024-08-31 14:48:01 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-08-31 14:48:01 +0800 |
| commit | 47e72b2a8a6b97ee8362f81c3cacb9b1d4f54027 (patch) | |
| tree | f86d34c56fb3b8c1c9a678b77def3f820bdb4489 | |
| parent | 21ae0fa4451c40b14199fdb0df8cf61c51e26de9 (diff) | |
| parent | de962524a514adfc2f10c94cfda12eaf758848d0 (diff) | |
Merge pull request #5549 from yh-sb/vulkansdk-mingw-fix
Fix vulkansdk searching for mingw platform
| -rw-r--r-- | xmake/modules/detect/sdks/find_vulkansdk.lua | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/xmake/modules/detect/sdks/find_vulkansdk.lua b/xmake/modules/detect/sdks/find_vulkansdk.lua index 6ddeddd27..04bc59912 100644 --- a/xmake/modules/detect/sdks/find_vulkansdk.lua +++ b/xmake/modules/detect/sdks/find_vulkansdk.lua @@ -30,13 +30,14 @@ import("lib.detect.find_package") function _find_vulkan_from_paths(paths, opt) opt = opt or {} local arch = opt.arch or config.arch() or os.arch() + local plat = opt.plat or config.plat() or os.host() local binsuffix = ((is_host("windows") and arch == "x86") and "bin32" or "bin") local libname = (is_host("windows") and "vulkan-1" or "vulkan") local libsuffix = ((is_host("windows") and arch == "x86") and "lib32" or "lib") -- find library local result = {links = {}, linkdirs = {}, includedirs = {}} - local linkinfo = find_library(libname, paths, {suffixes = {libsuffix}}) + local linkinfo = find_library(libname, paths, {suffixes = {libsuffix}, plat = plat}) if linkinfo then result.sdkdir = path.directory(linkinfo.linkdir) result.bindir = path.join(result.sdkdir, binsuffix) |