Skip to content

Commit d2596c5

Browse files
author
Github Actions
committed
Merge 3.3.5 to 3.3.5-vas-autobalance
2 parents 41bb32a + ca7a87f commit d2596c5

File tree

199 files changed

+28451
-12456
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

199 files changed

+28451
-12456
lines changed

dep/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ if(SERVERS OR TOOLS)
2020
add_subdirectory(utf8cpp)
2121
add_subdirectory(valgrind)
2222
add_subdirectory(openssl)
23-
add_subdirectory(jemalloc)
23+
if(CMAKE_SYSTEM_NAME MATCHES "Linux" AND NOT NOJEM)
24+
add_subdirectory(jemalloc)
25+
endif()
2426
add_subdirectory(argon2)
2527
add_subdirectory(short_alloc)
2628
endif()

dep/PackageList.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ G3D (a commercial-grade C++ 3D engine available as Open Source (BSD License)
2525
Version: 9.0-Release r4036
2626

2727
jemalloc (a general-purpose scalable concurrent malloc-implementation)
28-
http://www.canonware.com/jemalloc/
29-
Version: 5.2.1
28+
https://github.com/jemalloc/jemalloc
29+
Version: 5.3.0
3030

3131
libMPQ (a library for reading MPQ files)
3232
https://github.com/mbroemme/libmpq/

0 commit comments

Comments
 (0)