Branch fixes.

alliedmodders · Sep 11, 2014 · ed081f0 · ed081f0
1 parent 1c6bfbd
commit ed081f0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/core/metamod_oslink.cpp b/core/metamod_oslink.cpp
@@ -94,7 +94,11 @@ bool GetFileOfAddress(void *pAddr, char *buffer, size_t maxlength)
 	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) {
 	return malloc(size);
 }

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