From b69b0de234a6d5242c5e6ef57218c56ccc74eac9 Mon Sep 17 00:00:00 2001
From: David Anderson <dvander@alliedmods.net>
Date: Mon, 30 Dec 2013 17:51:01 -0500
Subject: [PATCH] Various build fixes (bug 5997 part 14, r=ds).

---
 AMBuildScript                          | 2 ++
 extensions/curl/curl-src/lib/AMBuilder | 3 +--
 extensions/mysql/AMBuilder             | 2 +-
 tools/buildbot/PackageScript           | 5 +++++
 tools/buildbot/generate_headers.py     | 2 +-
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/AMBuildScript b/AMBuildScript
index 88646c7b..7be563ae 100644
--- a/AMBuildScript
+++ b/AMBuildScript
@@ -233,7 +233,9 @@ class SMConfig(object):
         '-mmacosx-version-min=10.5',
         '-arch', 'i386',
         '-lstdc++',
+        '-stdlib=libstdc++',
       ]
+      cfg.cxxflags += ['-stdlib=libstdc++']
     elif builder.target_platform == 'windows':
       cfg.defines += ['WIN32', '_WINDOWS']
 
diff --git a/extensions/curl/curl-src/lib/AMBuilder b/extensions/curl/curl-src/lib/AMBuilder
index 8748638c..90183ea6 100644
--- a/extensions/curl/curl-src/lib/AMBuilder
+++ b/extensions/curl/curl-src/lib/AMBuilder
@@ -58,6 +58,7 @@ binary.sources += [
   'llist.c',
   'md5.c',
   'memdebug.c',
+  'mprintf.c',
   'multi.c',
   'netrc.c',
   'nss.c',
@@ -87,7 +88,5 @@ binary.sources += [
   'url.c',
   'version.c'
 ]
-if builder.target_platform != 'windows':
-  builder.sources += ['mprintf.c']
 rvalue = builder.Add(binary)
 
diff --git a/extensions/mysql/AMBuilder b/extensions/mysql/AMBuilder
index 060ba9d1..1d0a4a92 100644
--- a/extensions/mysql/AMBuilder
+++ b/extensions/mysql/AMBuilder
@@ -8,7 +8,7 @@ if SM.mysql_root:
     os.path.join(SM.mms_root, 'core', 'sourcehook')
   ]
 
-  if builder.target_platform is 'linux' or builder.target_platform is 'darwin':
+  if builder.target_platform is 'linux' or builder.target_platform is 'mac':
     binary.compiler.postlink += [
       os.path.join(SM.mysql_root, 'lib', 'libmysqlclient_r.a'),
       '-lz',
diff --git a/tools/buildbot/PackageScript b/tools/buildbot/PackageScript
index 871011f5..641efb77 100644
--- a/tools/buildbot/PackageScript
+++ b/tools/buildbot/PackageScript
@@ -51,6 +51,11 @@ for cxx_task in SM.extensions:
   builder.AddCopy(cxx_task.binary, folder_map['addons/sourcemod/extensions'])
 builder.AddCopy(SM.spcomp.binary, folder_map['addons/sourcemod/scripting'])
 
+# Copy version_auto.inc.
+for header in SM.generated_headers:
+  if 'version_auto.inc' in header.path:
+    builder.AddCopy(header, folder_map['addons/sourcemod/scripting/include'])
+
 # Export PDB files. We write to a file in the build folder which is pretty
 # verboten, but it's okay if it's in the root since AMBuild will never try
 # to rmdir the root.
diff --git a/tools/buildbot/generate_headers.py b/tools/buildbot/generate_headers.py
index 6644f54c..97b5b915 100644
--- a/tools/buildbot/generate_headers.py
+++ b/tools/buildbot/generate_headers.py
@@ -33,7 +33,7 @@ def get_hg_version():
   return m.groups()
 
 def output_version_headers():
-  cset, rev = get_hg_version()
+  rev, cset = get_hg_version()
 
   with open(os.path.join(SourceFolder, 'product.version')) as fp:
     contents = fp.read()