aboutsummaryrefslogtreecommitdiff
path: root/xmake.lua
diff options
context:
space:
mode:
authorDan Engelbrecht <[email protected]>2023-08-11 16:39:45 +0200
committerGitHub <[email protected]>2023-08-11 16:39:45 +0200
commitbf4738df5cad0eaa61f4e24b8db7611e378f9f80 (patch)
tree6f0ada74fc5c49b71b64f7731c0681ef544bea65 /xmake.lua
parent0.2.16-pre0 (diff)
downloadzen-bf4738df5cad0eaa61f4e24b8db7611e378f9f80.tar.xz
zen-bf4738df5cad0eaa61f4e24b8db7611e378f9f80.zip
update vcpkg dependencies (#356)
* bump vcpkg version * fmt lib 10 fixes * xmake dependencies (with linux workarounds) * changelog
Diffstat (limited to 'xmake.lua')
-rw-r--r--xmake.lua23
1 files changed, 17 insertions, 6 deletions
diff --git a/xmake.lua b/xmake.lua
index 3bf27c296..930ef65c1 100644
--- a/xmake.lua
+++ b/xmake.lua
@@ -15,7 +15,6 @@ add_requires(
"vcpkg::json11",
"vcpkg::lua",
"vcpkg::lz4",
- "vcpkg::openssl",
"vcpkg::robin-map",
"vcpkg::sol2",
"vcpkg::spdlog",
@@ -24,13 +23,25 @@ add_requires(
"vcpkg::zstd"
)
-add_requires("7z") -- for bundling
+if is_plat("linux") then
+ add_requires("vcpkg::openssl 3.0.8")
+else
+ add_requires("vcpkg::openssl")
+end
+
+if is_plat("windows") then
+ add_requires("7z") -- for bundling
+end
if not is_arch("arm64") then
- add_requires(
- "vcpkg::mimalloc",
- "vcpkg::sentry-native"
- )
+ add_requires("vcpkg::mimalloc")
+ if has_config("zensentry") then
+ if is_plat("linux") then
+ add_requires("vcpkg::sentry-native 0.5.4")
+ else
+ add_requires("vcpkg::sentry-native")
+ end
+ end
end
add_rules("mode.debug", "mode.release")