Merge pull request #119 from Wend4r/fix-linuxsteamrt64_load

S2: Add a malloc override
alliedmodders · Sep 28, 2023 · 0e81445 · 0e81445
2 parents 4401a94 + 5ed17a9
commit 0e81445
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/AMBuildScript b/AMBuildScript
@@ -395,7 +395,7 @@ class MMSConfig(object):
     if compiler.target.arch == 'x86_64':
       compiler.defines += ['X64BITS', 'PLATFORM_64BITS']
 
-    if sdk.name in ['css', 'hl2dm', 'dods', 'sdk2013', 'bms', 'tf2', 'l4d', 'nucleardawn', 'l4d2', 'dota', 'cs2', 'pvkii']:
+    if sdk.name in ['css', 'hl2dm', 'dods', 'sdk2013', 'bms', 'tf2', 'l4d', 'nucleardawn', 'l4d2', 'pvkii']:
       if compiler.target.platform in ['linux', 'mac']:
         compiler.defines += ['NO_HOOK_MALLOC', 'NO_MALLOC_OVERRIDE']
 

diff --git a/core/metamod_oslink.cpp b/core/metamod_oslink.cpp
@@ -94,7 +94,7 @@ bool GetFileOfAddress(void *pAddr, char *buffer, size_t maxlength)
 	return true;
 }
 
-#if defined __GNUC__
+#if defined __GNUC__ && defined(NO_MALLOC_OVERRIDE)
 void * operator new(size_t size) {
 	return malloc(size);
 }