diff options
| -rw-r--r-- | zen/chunk/chunk.cpp | 11 | ||||
| -rw-r--r-- | zen/cmds/print.cpp | 2 | ||||
| -rw-r--r-- | zen/xmake.lua | 7 | ||||
| -rw-r--r-- | zenserver-test/xmake.lua | 6 | ||||
| -rw-r--r-- | zenserver/xmake.lua | 26 |
5 files changed, 40 insertions, 12 deletions
diff --git a/zen/chunk/chunk.cpp b/zen/chunk/chunk.cpp index b6dc0c465..f7ee8275e 100644 --- a/zen/chunk/chunk.cpp +++ b/zen/chunk/chunk.cpp @@ -64,8 +64,15 @@ struct combinable struct task_group { - void run(...) {} - void wait() {} + template <class Function> + void run(const Function& Func) + { + Func(); + } + + void wait() + { + } }; } // namespace Concurrency diff --git a/zen/cmds/print.cpp b/zen/cmds/print.cpp index 1a73443dc..fe9117c04 100644 --- a/zen/cmds/print.cpp +++ b/zen/cmds/print.cpp @@ -54,7 +54,7 @@ PrintCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv) if (CbValidateError Result = ValidateCompactBinary(Data, CbValidateMode::All); Result != CbValidateError::None) { - zen::ConsoleLog().error("Data in file '{}' does not appear to be compact binary (validation error {:#x})", m_Filename, Result); + zen::ConsoleLog().error("Data in file '{}' does not appear to be compact binary (validation error {:#x})", m_Filename, uint32_t(Result)); return 1; } diff --git a/zen/xmake.lua b/zen/xmake.lua index a65203666..225a210ff 100644 --- a/zen/xmake.lua +++ b/zen/xmake.lua @@ -15,5 +15,12 @@ target("zen") add_ldflags("/LTCG") end + if is_plat("macosx") then + add_ldflags("-framework CoreFoundation") + add_ldflags("-framework Security") + add_ldflags("-framework SystemConfiguration") + add_syslinks("bsm") + end + add_packages("vcpkg::zstd") add_packages("vcpkg::cxxopts", "vcpkg::mimalloc") diff --git a/zenserver-test/xmake.lua b/zenserver-test/xmake.lua index be3c56a7d..8854dca8e 100644 --- a/zenserver-test/xmake.lua +++ b/zenserver-test/xmake.lua @@ -5,3 +5,9 @@ target("zenserver-test") add_deps("zencore", "zenutil", "zenhttp") add_deps("zenserver", {inherit=false}) add_packages("vcpkg::http-parser", "vcpkg::mimalloc") + + if is_plat("macosx") then + add_ldflags("-framework CoreFoundation") + add_ldflags("-framework Security") + add_ldflags("-framework SystemConfiguration") + end diff --git a/zenserver/xmake.lua b/zenserver/xmake.lua index 339afbfe5..d6ef47a53 100644 --- a/zenserver/xmake.lua +++ b/zenserver/xmake.lua @@ -18,19 +18,27 @@ target("zenserver") del_files("windows/**") end + if is_plat("macosx") then + add_ldflags("-framework CoreFoundation") + add_ldflags("-framework CoreGraphics") + add_ldflags("-framework CoreText") + add_ldflags("-framework Foundation") + add_ldflags("-framework Security") + add_ldflags("-framework SystemConfiguration") + add_syslinks("bsm") + end + add_options("vfs") add_options("compute") add_packages( - "vcpkg::sentry-native", - "vcpkg::sol2", - "vcpkg::lua", "vcpkg::asio", - "vcpkg::json11", + "vcpkg::cxxopts", "vcpkg::http-parser", - "vcpkg::rocksdb" + "vcpkg::json11", + "vcpkg::lua", + "vcpkg::mimalloc", + "vcpkg::rocksdb", + "vcpkg::sentry-native", + "vcpkg::sol2" ) - - add_packages( - "vcpkg::cxxopts", - "vcpkg::mimalloc") |