Remove mimalloc

Author: kbinani

Builds/Package/Package.wapproj

@@ -174,8 +174,6 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="DA08D2E73A0E4751340035CBAA17DC9C4DCC647D.pfx" />
-    <Content Include="mcview\mimalloc-redirect.dll" />
-    <Content Include="mcview\mimalloc.dll" />
     <Content Include="Images\SplashScreen.scale-200.png" />
     <Content Include="Images\LockScreenLogo.scale-200.png" />
     <Content Include="Images\Square150x150Logo.scale-200.png" />

CMakeLists.txt

@@ -21,10 +21,10 @@ if (MSVC)
     /wd4100 # Suppress "unreferenced formal parameter" warnings
   )
   add_compile_options(
-    $<$<CONFIG:Debug>:/MDd>
-    $<$<CONFIG:Release>:/MD>
-    $<$<CONFIG:RelWithDebInfo>:/MD>
-    $<$<CONFIG:MinSizeRel>:/MD>
+    $<$<CONFIG:Debug>:/MTd>
+    $<$<CONFIG:Release>:/MT>
+    $<$<CONFIG:RelWithDebInfo>:/MT>
+    $<$<CONFIG:MinSizeRel>:/MT>
     /MP
   )
 elseif(APPLE)
@@ -40,16 +40,6 @@ CPMAddPackage(
   GIT_TAG 7c86f4f83b23b53ac464d80fbc7f17fabb4984be
 )
 
-CPMAddPackage(
-  NAME mimalloc
-  GITHUB_REPOSITORY microsoft/mimalloc
-  VERSION 2.1.7
-  OPTIONS "MI_OVERRIDE ON"
-          "MI_BUILD_TESTS OFF"
-          "MI_BUILD_OBJECT OFF"
-          "MI_BUILD_STATIC OFF"
-          "MI_WIN_REDIRECT ON")
-
 add_subdirectory(ext/je2be-core)
 add_subdirectory(ext/JUCE)
 
@@ -204,9 +194,6 @@ target_link_libraries(mcview
     juce::juce_recommended_config_flags
     juce::juce_recommended_lto_flags
 )
-if (MSVC)
-  target_link_libraries(mcview PRIVATE mimalloc)
-endif()
 
 target_include_directories(mcview
   PRIVATE
@@ -228,25 +215,3 @@ configure_file(
   ${CMAKE_CURRENT_SOURCE_DIR}/Builds/Package/Package.appxmanifest.in
   ${CMAKE_CURRENT_SOURCE_DIR}/Builds/Package/Package.appxmanifest
 )
-
-if (MSVC)
-  add_custom_command(TARGET mcview POST_BUILD
-    COMMAND "${CMAKE_COMMAND}" -E copy "${mimalloc_BINARY_DIR}/\$(Configuration)/mimalloc.dll" "$<TARGET_FILE_DIR:mcview>/"
-    COMMAND "${CMAKE_COMMAND}" -E copy "${mimalloc_BINARY_DIR}/\$(Configuration)/mimalloc-redirect.dll" "$<TARGET_FILE_DIR:mcview>/"
-    COMMENT "Copy mimalloc dlls to output directory")
-
-  add_custom_command(TARGET mcview POST_BUILD
-    COMMAND
-      "$<$<CONFIG:Release>:${CMAKE_COMMAND}>"
-      "$<$<CONFIG:Release>:-E>"
-      "$<$<CONFIG:Release>:copy>"
-      "$<$<CONFIG:Release>:${mimalloc_BINARY_DIR}/Release/mimalloc.dll>"
-      "$<$<CONFIG:Release>:${CMAKE_CURRENT_SOURCE_DIR}/Builds/Package/mcview/>"
-    COMMAND
-      "$<$<CONFIG:Release>:${CMAKE_COMMAND}>"
-      "$<$<CONFIG:Release>:-E>"
-      "$<$<CONFIG:Release>:copy>"
-      "$<$<CONFIG:Release>:${mimalloc_BINARY_DIR}/Release/mimalloc-redirect.dll>"
-      "$<$<CONFIG:Release>:${CMAKE_CURRENT_SOURCE_DIR}/Builds/Package/mcview/>"
-    COMMENT "Copy mimalloc dlls to package output directory")
-endif()

Source/Application.cpp

@@ -2,9 +2,6 @@
 #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>
 
@@ -100,10 +97,6 @@ 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.
     // Palette::ResearchJava("mcview-missing-block");