diff options
| author | Martin Ridgers <[email protected]> | 2021-11-15 15:13:34 +0100 |
|---|---|---|
| committer | Martin Ridgers <[email protected]> | 2021-11-15 15:13:34 +0100 |
| commit | c3351f38e578129985eb393432ad56c59df5bd2a (patch) | |
| tree | 4238b0c747cde6ee985a63fece75f72dcf95dae7 | |
| parent | Deleted some debug code submitted by accident (diff) | |
| download | zen-c3351f38e578129985eb393432ad56c59df5bd2a.tar.xz zen-c3351f38e578129985eb393432ad56c59df5bd2a.zip | |
libcrypto links again libdl so the latter also needs careful handling in xmake
| -rw-r--r-- | zencore/xmake.lua | 3 | ||||
| -rw-r--r-- | zenserver/xmake.lua | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/zencore/xmake.lua b/zencore/xmake.lua index 5923b99c3..eade07700 100644 --- a/zencore/xmake.lua +++ b/zencore/xmake.lua @@ -39,5 +39,6 @@ target('zencore') -- xmake to use the correct order, and "syslinks" is used to force the -- arguments to the end of the line (otherwise they can appear before -- curl and cause more errors). - add_syslinks("ssl", "crypto") + add_syslinks("crypto") + add_syslinks("dl") end diff --git a/zenserver/xmake.lua b/zenserver/xmake.lua index b29d2cef3..fc5dca88a 100644 --- a/zenserver/xmake.lua +++ b/zenserver/xmake.lua @@ -30,10 +30,6 @@ target("zenserver") "vcpkg::http-parser" ) - if is_plat("linux") then - add_syslinks("dl") - end - add_packages( "vcpkg::cxxopts", "vcpkg::mimalloc") |