Fix packaging & mac build

tiltedphoques · Dec 22, 2020 · c6a5137 · c6a5137
1 parent c03e133
commit c6a5137
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/Code/core/src/StandardAllocator.cpp b/Code/core/src/StandardAllocator.cpp
@@ -1,7 +1,11 @@
 #include "StandardAllocator.hpp"
 
 #include <cstdlib>
+#ifndef __APPLE__
+#include <malloc/malloc.h>
+#else
 #include <malloc.h>
+#endif
 
 namespace TiltedPhoques
 {
@@ -23,6 +27,8 @@ namespace TiltedPhoques
         return _msize(apData);
 #elif __linux__
         return malloc_usable_size(apData);
+#elif __APPLE__
+        return malloc_size(apData);
 #else
         static_assert(false, "Not implemented");
         return 0;

diff --git a/xmake.lua b/xmake.lua
@@ -6,7 +6,7 @@ target("TiltedCore")
     set_kind("static")
     add_files("Code/core/src/*.cpp")
     add_includedirs("Code/core/include/", {public = true})
-    add_headerfiles("Core/core/include/*.hpp", {prefixdir = "TiltedCore"})
+    add_headerfiles("Code/core/include/*.hpp", {prefixdir = "TiltedCore"})
     add_packages("mimalloc")
 
 target("Tests")