diff options
| author | Stefan Boberg <[email protected]> | 2022-09-20 17:28:41 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-09-20 17:28:41 +0200 |
| commit | a735967c7c54fcecbfd9760286afc06a3b48233a (patch) | |
| tree | 4789717b7a05c7122cb366d3bcf5810db9678058 /zencore/xmake.lua | |
| parent | rename URI chunk requests from value -> chunk (#166) (diff) | |
| download | zen-a735967c7c54fcecbfd9760286afc06a3b48233a.tar.xz zen-a735967c7c54fcecbfd9760286afc06a3b48233a.zip | |
Use BLAKE3 port from vcpkg (#141)
use BLAKE3 port from vcpkg instead of in-tree binaries
Diffstat (limited to 'zencore/xmake.lua')
| -rw-r--r-- | zencore/xmake.lua | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/zencore/xmake.lua b/zencore/xmake.lua index f01c12c86..aae20274b 100644 --- a/zencore/xmake.lua +++ b/zencore/xmake.lua @@ -14,40 +14,33 @@ target('zencore') add_includedirs("include", {public=true}) add_includedirs("$(projectdir)/thirdparty/utfcpp/source") add_includedirs("$(projectdir)/thirdparty/trace", {public=true}) + add_links("blake3") if is_os("windows") then - add_linkdirs("$(projectdir)/thirdparty/BLAKE3/lib/Win64") add_linkdirs("$(projectdir)/thirdparty/Oodle/lib/Win64") elseif is_os("linux") then - add_linkdirs("$(projectdir)/thirdparty/BLAKE3/lib/Linux_x64") add_linkdirs("$(projectdir)/thirdparty/Oodle/lib/Linux_x64") - add_links("blake3") add_links("oo2corelinux64") add_syslinks("pthread") elseif is_os("macosx") then - if is_arch("arm64") then - add_linkdirs("$(projectdir)/thirdparty/BLAKE3/lib/Mac_arm64") - else - add_linkdirs("$(projectdir)/thirdparty/BLAKE3/lib/Mac_x64") - end add_linkdirs("$(projectdir)/thirdparty/Oodle/lib/Mac_x64") - add_links("blake3") add_links("oo2coremac64") end add_options("zentrace") add_packages( - "vcpkg::spdlog", - "vcpkg::fmt", - "vcpkg::doctest", + "vcpkg::blake3", "vcpkg::catch2", + "vcpkg::cpr", + "vcpkg::curl", -- required by cpr + "vcpkg::doctest", + "vcpkg::fmt", + "vcpkg::gsl-lite", "vcpkg::json11", "vcpkg::lz4", "vcpkg::mimalloc", - "vcpkg::cpr", - "vcpkg::curl", -- required by cpr - "vcpkg::zlib", -- required by curl "vcpkg::openssl", -- required by curl - "vcpkg::xxhash", - "vcpkg::gsl-lite") + "vcpkg::spdlog", + "vcpkg::zlib", -- required by curl + "vcpkg::xxhash") if is_plat("linux") then -- The 'vcpkg::openssl' package is two libraries; ssl and crypto, with |