diff options
Diffstat (limited to 'zencore')
| -rw-r--r-- | zencore/blake3.cpp | 7 | ||||
| -rw-r--r-- | zencore/xmake.lua | 27 |
2 files changed, 12 insertions, 22 deletions
diff --git a/zencore/blake3.cpp b/zencore/blake3.cpp index 02d6eb241..89826ae5d 100644 --- a/zencore/blake3.cpp +++ b/zencore/blake3.cpp @@ -7,13 +7,10 @@ #include <zencore/testing.h> #include <zencore/zencore.h> -#include "../thirdparty/BLAKE3/c/blake3.h" -#if ZEN_PLATFORM_WINDOWS -# pragma comment(lib, "blake3.lib") -#endif - #include <string.h> +#include "blake3.h" + ////////////////////////////////////////////////////////////////////////// namespace zen { 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 |