From 66421508282ec5b34dd66916c41a894c2ebd4ccb Mon Sep 17 00:00:00 2001 From: kaoru Date: Sun, 28 Apr 2024 01:13:37 +0800 Subject: check the generated vcpkg triplet no triplet named x86-linux-dynamic and the plat on macos is osx --- xmake/modules/package/manager/vcpkg/configurations.lua | 9 ++++++--- 1 file 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 -- cgit v1.3.1