diff options
| -rw-r--r-- | xmake.lua | 14 | ||||
| -rw-r--r-- | zencore/include/zencore/zencore.h | 7 |
2 files changed, 13 insertions, 8 deletions
@@ -89,14 +89,14 @@ if not is_arch("arm64") then set_description("Enables Sentry support in Zen") option_end() add_define_by_config("ZEN_USE_SENTRY", "zensentry") -end -option("zenmimalloc") - set_default(true) - set_showmenu(true) - set_description("Use MiMalloc as Zen's allocator") -option_end() -add_define_by_config("ZEN_USE_MIMALLOC", "zenmimalloc") + option("zenmimalloc") + set_default(true) + set_showmenu(true) + set_description("Use MiMalloc as Zen's allocator") + option_end() + add_define_by_config("ZEN_USE_MIMALLOC", "zenmimalloc") +end if is_os("windows") then option("vfs") diff --git a/zencore/include/zencore/zencore.h b/zencore/include/zencore/zencore.h index 26155abc8..9f8af8c41 100644 --- a/zencore/include/zencore/zencore.h +++ b/zencore/include/zencore/zencore.h @@ -314,7 +314,12 @@ ZENCORE_API void zencore_forcelinktests(); ////////////////////////////////////////////////////////////////////////// #ifndef ZEN_USE_MIMALLOC -# define ZEN_USE_MIMALLOC 1 +# if ZEN_ARCH_ARM64 + // The vcpkg mimalloc port doesn't support Arm targets +# define ZEN_USE_MIMALLOC 0 +# else +# define ZEN_USE_MIMALLOC 1 +# endif #endif ////////////////////////////////////////////////////////////////////////// |