Disable mimalloc for macOS

kbinani · Dec 10, 2024 · b43778d · b43778d
1 parent e2018c2
commit b43778d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -198,13 +198,15 @@ target_link_libraries(mcview
   PRIVATE
     mcview-binary-data
     je2be
-    mimalloc
     juce::juce_gui_extra
     juce::juce_opengl
   PUBLIC
     juce::juce_recommended_config_flags
     juce::juce_recommended_lto_flags
 )
+if (MSVC)
+  target_link_libraries(mcview PRIVATE mimalloc)
+endif()
 
 target_include_directories(mcview
   PRIVATE

diff --git a/Source/Application.cpp b/Source/Application.cpp
@@ -2,7 +2,9 @@
 #include <juce_gui_extra/juce_gui_extra.h>
 #include <juce_opengl/juce_opengl.h>
 #include <leveldb/env.h>
+#if !defined(__APPLE__)
 #include <mimalloc.h>
+#endif
 #include <minecraft-file.hpp>
 #include <nlohmann/json.hpp>
 
@@ -98,7 +100,9 @@ class Application : public juce::JUCEApplication {
   void initialise(juce::String const &) override {
     using namespace juce;
 
+#if !defined(__APPLE__)
     (void)mi_version();
+#endif
 
 #if MCVIEW_ENABLE_PALETTE_PREP
     // 1. Execute the line below.