From a11c4aed3dbca47c37e9ff23291b7f552ac19970 Mon Sep 17 00:00:00 2001
From: Kp <kp@valhallalegends.com>
Date: Sat, 13 Sep 2014 22:09:32 +0000
Subject: [PATCH] Shorten vers_id command line

---
 SConstruct               | 2 +-
 similar/main/vers_id.cpp | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/SConstruct b/SConstruct
index b0cfed248..913ce3441 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1806,7 +1806,7 @@ class DXXProgram(DXXCommon):
 			versid_cppdefines.append(('DESCENT_VERSION_EXTRA', self._quote_cppdefine(extra_version)))
 		versid_cppdefines.append(('DESCENT_git_status', self._quote_cppdefine(git_describe_version[1])))
 		versid_build_environ.append('git_status')
-		versid_cppdefines.append(('RECORD_BUILD_ENVIRONMENT', "'" + ''.join(['RECORD_BUILD_VARIABLE(%s);' % k for k in versid_build_environ]) + "'"))
+		versid_cppdefines.append(('DXX_RBE"(A)"', "'" + ''.join(['A(%s)' % k for k in versid_build_environ]) + "'"))
 		versid_objlist = [self.env.StaticObject(target='%s%s%s' % (self.user_settings.builddir, self._apply_target_name(s), self.env["OBJSUFFIX"]), source=s, CPPDEFINES=versid_cppdefines) for s in ['similar/main/vers_id.cpp']]
 		if self.env._dxx_pch_node:
 			self.env.Depends(versid_objlist[0], self.env._dxx_pch_node)
diff --git a/similar/main/vers_id.cpp b/similar/main/vers_id.cpp
index 7a817708f..abe59da49 100644
--- a/similar/main/vers_id.cpp
+++ b/similar/main/vers_id.cpp
@@ -4,6 +4,7 @@
  * project's Git history.  See COPYING.txt at the top level for license
  * terms and a link to the Git history.
  */
+#include "dxxsconf.h"
 #include "vers_id.h"
 
 #if defined(DXX_BUILD_DESCENT_I)
@@ -17,9 +18,9 @@
 const char g_descent_version[] = "D" DXX_NAME_NUMBER "X-Rebirth " DESCENT_VERSION_EXTRA;
 const char g_descent_build_datetime[21] = __DATE__ " " __TIME__;
 
-#ifdef RECORD_BUILD_ENVIRONMENT
+#ifdef DXX_RBE
 #define RECORD_BUILD_VARIABLE(X)	extern const char g_descent_##X[];	\
-	const char g_descent_##X[] = #X "=" DESCENT_##X
+	const char g_descent_##X[] __attribute_used = #X "=" DESCENT_##X;
 
-RECORD_BUILD_ENVIRONMENT;
+DXX_RBE(RECORD_BUILD_VARIABLE);
 #endif