Веб-сайт самохостера Lotigara

summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKae <80987908+Novaenia@users.noreply.github.com>2025-06-06 14:26:34 +1000
committerKae <80987908+Novaenia@users.noreply.github.com>2025-06-06 14:26:34 +1000
commit889114953fcc10552c83dff5a979e40d51356b65 (patch)
tree6c6e1bb5b766639654f80265fcf484c2536d0b0d
parent73e71cb452ee4cfd4453fb4051593db4d0d5293b (diff)
jemalloc fix
i am as blind as a bat
-rw-r--r--.gitignore1
-rw-r--r--source/CMakePresets.json9
-rw-r--r--source/core/StarMemory.cpp2
3 files changed, 11 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 2b6ebe1..15aa777 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
/build/
/build_linux/
/out/
+/source/out/
/Output/
/windows/
/linux/
diff --git a/source/CMakePresets.json b/source/CMakePresets.json
index e337b53..e3f96c2 100644
--- a/source/CMakePresets.json
+++ b/source/CMakePresets.json
@@ -52,6 +52,7 @@
"displayName": "Linux x64",
"binaryDir": "${sourceParentDir}/build/linux-release",
"cacheVariables": {
+ "CMAKE_MAKE_PROGRAM": "ninja",
"CMAKE_BUILD_TYPE": "Release",
"VCPKG_TARGET_TRIPLET": "x64-linux-mixed",
"CMAKE_INCLUDE_PATH": "${sourceParentDir}/lib/linux/include",
@@ -62,6 +63,10 @@
"vendor": {
"microsoft.com/VisualStudioSettings/CMake/1.0": {
"hostOS": [ "Linux" ]
+ },
+ "microsoft.com/VisualStudioRemoteSettings/CMake/2.0": {
+ "sourceRootDir": "$ms{localSourceDir}\\..",
+ "remoteSourceRootDir": "$env{HOME}/.vs/wsl"
}
}
},
@@ -94,6 +99,10 @@
"vendor": {
"microsoft.com/VisualStudioSettings/CMake/1.0": {
"hostOS": [ "macOS" ]
+ },
+ "microsoft.com/VisualStudioRemoteSettings/CMake/2.0": {
+ "sourceRootDir": "$ms{localSourceDir}\\..",
+ "remoteSourceRootDir": "$env{HOME}/.vs/wsl"
}
}
},
diff --git a/source/core/StarMemory.cpp b/source/core/StarMemory.cpp
index dc13d08..6ecc509 100644
--- a/source/core/StarMemory.cpp
+++ b/source/core/StarMemory.cpp
@@ -51,7 +51,7 @@ namespace Star {
void free(void* ptr, size_t size) {
if (ptr)
- je_sdallocx(ptr, size, 0);
+ ::sdallocx(ptr, size, 0);
}
#endif
#elif STAR_USE_MIMALLOC