diff options
| author | grbr404 <166065505+grbr404@users.noreply.github.com> | 2025-06-05 22:09:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-06-05 22:09:30 +0200 |
| commit | 75c4d38b21cf68d37c73dba2468ebf2222825c24 (patch) | |
| tree | ef36b1710284fbdd6e06c780bc9b387e6b38e2d9 /source | |
| parent | aafc44a77e46c25e6097b98e7fdae76ef4aee7cd (diff) | |
| parent | 70c49e9ddbc719b2a84f832dae02c80b443fda02 (diff) | |
Merge branch 'OpenStarbound:main' into item-count-chainges
Diffstat (limited to 'source')
| -rw-r--r-- | source/CMakePresets.json | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/CMakePresets.json b/source/CMakePresets.json index b0c27a1..e337b53 100644 --- a/source/CMakePresets.json +++ b/source/CMakePresets.json @@ -57,7 +57,7 @@ "CMAKE_INCLUDE_PATH": "${sourceParentDir}/lib/linux/include", "CMAKE_LIBRARY_PATH": "${sourceParentDir}/lib/linux", "STAR_ENABLE_STATIC_LIBGCC_LIBSTDCXX": true, - "STAR_USE_JEMALLOC": false + "STAR_USE_JEMALLOC": true }, "vendor": { "microsoft.com/VisualStudioSettings/CMake/1.0": { @@ -74,7 +74,7 @@ "CMAKE_C_COMPILER": "clang", "CMAKE_CXX_COMPILER": "clang++", "VCPKG_TARGET_TRIPLET": "x64-linux-mixed-clang", - "STAR_USE_JEMALLOC": true + "STAR_USE_JEMALLOC": false } }, { |