rooty/HLMetaModOfficial
1
0
Fork 0
mirror of https://github.com/alliedmodders/metamod-source.git synced 2025-01-30 19:52:17 +01:00
Code Issues Releases Activity

Merge pull request #119 from Wend4r/fix-linuxsteamrt64_load

Browse Source 
S2: Add a malloc override
This commit is contained in:
Nicholas Hastings 2023-09-28 20:53:47 +00:00 committed by GitHub
commit 0e8144585e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AMBuildScript
View File

@ -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']

2
core/metamod_oslink.cpp
View File

@ -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);
}