TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Shorten vers_id command line

Browse source
This commit is contained in:
Kp 2014-09-13 22:09:32 +00:00
parent f5ee5f8813
commit a11c4aed3d
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
SConstruct
View file

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

7
similar/main/vers_id.cpp
View file

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