rooty/HLMetaModOfficial
1
0
Fork 0
mirror of https://github.com/alliedmodders/metamod-source.git synced 2025-02-20 13:54:14 +01:00
Code Issues Releases Activity

Branch fixes.

Browse Source
This commit is contained in:
David Anderson 2014-09-10 22:26:34 -07:00
parent 1c6bfbde95
commit ed081f045e
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/metamod_oslink.cpp
View File

@ -94,7 +94,11 @@ bool GetFileOfAddress(void *pAddr, char *buffer, size_t maxlength)
return true; return true;
} }
#if defined __GNUC__ && (__GNUC__ == 3 || __GNUC__ == 4) #if defined __linux__ || defined __APPLE__
extern "C" void __cxa_pure_virtual(void)
{
}
void * operator new(size_t size) { void * operator new(size_t size) {
return malloc(size); return malloc(size);
} }

2
support/buildbot/generate_headers.py
View File

@ -50,7 +50,7 @@ def output_version_header():
count, shorthash, longhash = get_git_version() count, shorthash, longhash = get_git_version()
with open(os.path.join(SourceFolder, 'product.version')) as fp: with open(os.path.join(SourceFolder, 'product.version')) as fp:
contents = fp.read() contents = fp.read().strip()
m = re.match('(\d+)\.(\d+)\.(\d+)-?(.*)', contents) m = re.match('(\d+)\.(\d+)\.(\d+)-?(.*)', contents)
if m == None: if m == None:
raise Exception('Could not detremine product version') raise Exception('Could not detremine product version')