diff options
| -rw-r--r-- | source/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | source/CMakePresets.json | 4 | ||||
| -rw-r--r-- | source/core/StarMemory.cpp | 18 | ||||
| -rw-r--r-- | triplets/x64-windows-mixed-md.cmake | 2 |
4 files changed, 5 insertions, 27 deletions
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index db36cd6..abcdff1 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -457,15 +457,11 @@ endif() # Find all required external libraries, based on build settings... - - - if(STAR_USE_JEMALLOC) find_package(PkgConfig) - pkg_check_modules(JEMALLOC REQUIRED jemalloc) + pkg_check_modules(JEMALLOC REQUIRED IMPORTED_TARGET GLOBAL jemalloc) - include_directories(SYSTEM ${JEMALLOC_INCLUDE_DIRS}) - set(STAR_EXT_LIBS ${JEMALLOC_LIBRARY}) + set(STAR_EXT_LIBS PkgConfig::JEMALLOC) endif() if (STAR_USE_MIMALLOC) diff --git a/source/CMakePresets.json b/source/CMakePresets.json index 61b4502..8e96181 100644 --- a/source/CMakePresets.json +++ b/source/CMakePresets.json @@ -32,8 +32,8 @@ "CMAKE_MSVC_RUNTIME_LIBRARY": "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL", "CMAKE_INCLUDE_PATH": "${sourceParentDir}/lib/windows/include", "CMAKE_LIBRARY_PATH": "${sourceParentDir}/lib/windows", - "STAR_USE_RPMALLOC": false, - "STAR_USE_JEMALLOC": true + "STAR_USE_RPMALLOC": true, + "STAR_USE_JEMALLOC": false }, "vendor": { "microsoft.com/VisualStudioSettings/CMake/1.0": { diff --git a/source/core/StarMemory.cpp b/source/core/StarMemory.cpp index c7818f3..9a9b2d2 100644 --- a/source/core/StarMemory.cpp +++ b/source/core/StarMemory.cpp @@ -19,7 +19,6 @@ static bool _rpm_linker_ref = rpm_linker_ref(); namespace Star { #ifdef STAR_USE_JEMALLOC -#ifdef STAR_JEMALLOC_IS_PREFIXED void* malloc(size_t size) { return je_malloc(size); } @@ -36,23 +35,6 @@ namespace Star { if (ptr) je_sdallocx(ptr, size, 0); } -#else - void* malloc(size_t size) { - return ::malloc(size); - } - - void* realloc(void* ptr, size_t size) { - return ::realloc(ptr, size); - } - - void free(void* ptr) { - ::free(ptr); - } - - void free(void* ptr, size_t size) { - ::free(ptr); - } -#endif #elif STAR_USE_MIMALLOC void* malloc(size_t size) { return mi_malloc(size); diff --git a/triplets/x64-windows-mixed-md.cmake b/triplets/x64-windows-mixed-md.cmake index 7b344f8..d2c996e 100644 --- a/triplets/x64-windows-mixed-md.cmake +++ b/triplets/x64-windows-mixed-md.cmake @@ -2,7 +2,7 @@ set(VCPKG_TARGET_ARCHITECTURE x64) set(VCPKG_CRT_LINKAGE dynamic) set(VCPKG_LIBRARY_LINKAGE static) -if(PORT MATCHES "sdl|discord-") +if(PORT MATCHES "jemalloc|sdl|discord-") set(VCPKG_LIBRARY_LINKAGE dynamic) endif() |