Skip to content

Commit

Permalink
add mimalloc internally to fix libatomic being linked dynamically
Browse files Browse the repository at this point in the history
  • Loading branch information
radkesvat committed Jul 12, 2024
1 parent d208cc9 commit d87b87b
Show file tree
Hide file tree
Showing 126 changed files with 50,699 additions and 15 deletions.
3 changes: 2 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
*.h linguist-language=C
ww/lwip/** linguist-vendored
ww/lwip/** linguist-vendored
ww/managers/mimalloc/** linguist-vendored
15 changes: 1 addition & 14 deletions ww/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -80,20 +80,7 @@ if(cjson_ADDED)

endif()



CPMAddPackage(
NAME mimalloc
VERSION 2.1.7
GITHUB_REPOSITORY microsoft/mimalloc
OPTIONS
"MI_OVERRIDE OFF"
"MI_BUILD_TESTS OFF"
"MI_BUILD_SHARED OFF"
"MI_SKIP_COLLECT_ON_EXIT ON"
)


add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/managers/mimalloc)
target_link_libraries(ww PUBLIC mimalloc-static)


Expand Down
12 changes: 12 additions & 0 deletions ww/managers/mimalloc/.gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# default behavior is to always use unix style line endings
* text eol=lf
*.png binary
*.pdn binary
*.jpg binary
*.sln binary
*.suo binary
*.vcproj binary
*.patch binary
*.dll binary
*.lib binary
*.exe binary
11 changes: 11 additions & 0 deletions ww/managers/mimalloc/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
ide/vs20??/*.db
ide/vs20??/*.opendb
ide/vs20??/*.user
ide/vs20??/*.vcxproj.filters
ide/vs20??/.vs
ide/vs20??/VTune*
out/
docs/
*.zip
*.tar
*.gz
Loading

0 comments on commit d87b87b

Please sign in to comment.