diff options
| author | kaoru <[email protected]> | 2024-04-28 01:13:37 +0800 |
|---|---|---|
| committer | kaoru <[email protected]> | 2024-04-28 01:13:37 +0800 |
| commit | 66421508282ec5b34dd66916c41a894c2ebd4ccb (patch) | |
| tree | 7067c67326c4d0c755c770155d671587e7f26e47 | |
| parent | 610fbdbff9f85aaf6dbfd8c086ef28c1d2faf29f (diff) | |
check the generated vcpkg triplet
no triplet named x86-linux-dynamic
and the plat on macos is osx
| -rw-r--r-- | xmake/modules/package/manager/vcpkg/configurations.lua | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/xmake/modules/package/manager/vcpkg/configurations.lua b/xmake/modules/package/manager/vcpkg/configurations.lua index 1bd239597..12bc5f5bd 100644 --- a/xmake/modules/package/manager/vcpkg/configurations.lua +++ b/xmake/modules/package/manager/vcpkg/configurations.lua @@ -57,11 +57,14 @@ function triplet(configs, plat, arch) triplet = triplet .. "-md" end elseif plat == "linux" then - if (arch == "x64" or arch == "x86") and configs.shared then + -- x64-linux-dynamic + if arch == "x64" and configs.shared then triplet = triplet .. "-dynamic" end - elseif plat == "macosx" then - if arch == "x64" and configs.shared then + elseif plat == "osx" then + -- x64-osx-dynamic + -- arm64-osx-dynamic + if (arch == "x64" or arch == "arm64") and configs.shared then triplet = triplet .. "-dynamic" end elseif plat == "mingw" then |