aboutsummaryrefslogtreecommitdiff
path: root/zencore/include
diff options
context:
space:
mode:
authorMartin Ridgers <[email protected]>2022-01-14 09:50:13 +0100
committerMartin Ridgers <[email protected]>2022-01-14 09:50:44 +0100
commit8c5e944a180549f54f5c42fed5d4dd91343bfbe1 (patch)
treec8898cdefe955c242124d7acb5226e26270618b3 /zencore/include
parentFixed up compile errors if mimalloc use is disabled (diff)
downloadzen-8c5e944a180549f54f5c42fed5d4dd91343bfbe1.tar.xz
zen-8c5e944a180549f54f5c42fed5d4dd91343bfbe1.zip
Disabled mimalloc on Mac-Arm64 as vcpkg doesn't support it
Diffstat (limited to 'zencore/include')
-rw-r--r--zencore/include/zencore/zencore.h7
1 files changed, 6 insertions, 1 deletions
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
//////////////////////////////////////////////////////////////////////////