From d295043ecfb99715a4b9580ffc35c156e90ac0f8 Mon Sep 17 00:00:00 2001
From: Honeybunch <amt3824@g.rit.edu>
Date: Wed, 15 Jun 2022 19:07:41 -0700
Subject: [PATCH] Fixing build for windows arm64

---
 CMakeLists.txt | 25 ++++++++++++++-----------
 src/init.c     |  2 +-
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8127e096..68f72922 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -305,18 +305,21 @@ if(MI_BUILD_SHARED)
       $<INSTALL_INTERFACE:${mi_install_incdir}>
   )
   if(WIN32)
-    # On windows copy the mimalloc redirection dll too.
-    if(CMAKE_SIZEOF_VOID_P EQUAL 4)
-      set(MIMALLOC_REDIRECT_SUFFIX "32")
-    else()
-      set(MIMALLOC_REDIRECT_SUFFIX "")
-    endif()
+    # Until the redirect lib has a version for arm don't try to copy it
+    if(NOT MSVC_C_ARCHITECTURE_ID MATCHES "ARM")
+      # On windows copy the mimalloc redirection dll too.
+      if(CMAKE_SIZEOF_VOID_P EQUAL 4)
+        set(MIMALLOC_REDIRECT_SUFFIX "32")
+      else()
+        set(MIMALLOC_REDIRECT_SUFFIX "")
+      endif()
 
-    target_link_libraries(mimalloc PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/bin/mimalloc-redirect${MIMALLOC_REDIRECT_SUFFIX}.lib)
-    add_custom_command(TARGET mimalloc POST_BUILD
-      COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_CURRENT_SOURCE_DIR}/bin/mimalloc-redirect${MIMALLOC_REDIRECT_SUFFIX}.dll" $<TARGET_FILE_DIR:mimalloc>
-      COMMENT "Copy mimalloc-redirect${MIMALLOC_REDIRECT_SUFFIX}.dll to output directory")
-    install(FILES "$<TARGET_FILE_DIR:mimalloc>/mimalloc-redirect${MIMALLOC_REDIRECT_SUFFIX}.dll" DESTINATION ${mi_install_libdir})
+      target_link_libraries(mimalloc PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/bin/mimalloc-redirect${MIMALLOC_REDIRECT_SUFFIX}.lib)
+      add_custom_command(TARGET mimalloc POST_BUILD
+        COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_CURRENT_SOURCE_DIR}/bin/mimalloc-redirect${MIMALLOC_REDIRECT_SUFFIX}.dll" $<TARGET_FILE_DIR:mimalloc>
+        COMMENT "Copy mimalloc-redirect${MIMALLOC_REDIRECT_SUFFIX}.dll to output directory")
+      install(FILES "$<TARGET_FILE_DIR:mimalloc>/mimalloc-redirect${MIMALLOC_REDIRECT_SUFFIX}.dll" DESTINATION ${mi_install_libdir})
+    endif()
   endif()
 
   install(TARGETS mimalloc EXPORT mimalloc DESTINATION ${mi_install_libdir} LIBRARY)  
diff --git a/src/init.c b/src/init.c
index 19124afe..3a4dd101 100644
--- a/src/init.c
+++ b/src/init.c
@@ -490,7 +490,7 @@ mi_decl_nodiscard bool mi_is_redirected(void) mi_attr_noexcept {
 }
 
 // Communicate with the redirection module on Windows
-#if defined(_WIN32) && defined(MI_SHARED_LIB)
+#if defined(_WIN32) && defined(MI_SHARED_LIB) && !(defined(_M_ARM) || defined(_M_ARM64))
 #ifdef __cplusplus
 extern "C" {
 #endif