diff options
| -rw-r--r-- | xmake.lua | 21 | ||||
| -rw-r--r-- | zenserver/zenserver.cpp | 7 |
2 files changed, 20 insertions, 8 deletions
@@ -16,7 +16,6 @@ add_requires( "vcpkg::mimalloc", "vcpkg::openssl", "vcpkg::robin-map", - "vcpkg::sentry-native", "vcpkg::sol2", "vcpkg::spdlog", "vcpkg::xxhash", @@ -24,6 +23,12 @@ add_requires( "vcpkg::zstd" ) +if not is_arch("arm64") then + add_requires( + "vcpkg::sentry-native" + ) +end + add_rules("mode.debug", "mode.release") if is_mode("release") then @@ -77,12 +82,14 @@ function add_define_by_config(define, config_name) add_defines(define.."="..value) end -option("zensentry") - set_default(true) - set_showmenu(true) - set_description("Enables Sentry support in Zen") -option_end() -add_define_by_config("ZEN_USE_SENTRY", "zensentry") +if not is_arch("arm64") then + option("zensentry") + set_default(true) + set_showmenu(true) + set_description("Enables Sentry support in Zen") + option_end() + add_define_by_config("ZEN_USE_SENTRY", "zensentry") +end option("zenmimalloc") set_default(true) diff --git a/zenserver/zenserver.cpp b/zenserver/zenserver.cpp index 38bb6eae4..5fdc81568 100644 --- a/zenserver/zenserver.cpp +++ b/zenserver/zenserver.cpp @@ -69,7 +69,12 @@ ZEN_THIRD_PARTY_INCLUDES_END // #if !defined(ZEN_USE_SENTRY) -# define ZEN_USE_SENTRY 1 +# if ZEN_PLATFORM_MAC && ZEN_ARCH_ARM64 + // vcpkg's sentry-native port does not support Arm on Mac. +# define ZEN_USE_SENTRY 0 +# else +# define ZEN_USE_SENTRY 1 +# endif #endif #if ZEN_USE_SENTRY |