From 1346a06ebda6590749c578328718b7b490e2aa03 Mon Sep 17 00:00:00 2001 From: divverent Date: Wed, 11 Jun 2008 11:20:33 +0000 Subject: [PATCH] also put svn revision (svnversion(1)) and build type into the version string git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@8353 d7cf8633-e32d-0410-b094-e92efae38249 --- builddate.c | 12 ++++++++++-- makefile.inc | 6 +++--- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/builddate.c b/builddate.c index dcf45be2..912252b1 100644 --- a/builddate.c +++ b/builddate.c @@ -1,3 +1,11 @@ +#define STRINGIFY2(arg) #arg +#define STRINGIFY(arg) STRINGIFY2(arg) -char *buildstring = __TIME__ " " __DATE__; - +char *buildstring = __TIME__ " " __DATE__ +#ifdef SVNREVISION +" " STRINGIFY(SVNREVISION) +#endif +#ifdef BUILDTYPE +" " STRINGIFY(BUILDTYPE) +#endif +; diff --git a/makefile.inc b/makefile.inc index 53567839..ab8a448f 100644 --- a/makefile.inc +++ b/makefile.inc @@ -170,9 +170,9 @@ DO_CC=$(CC) $(CFLAGS) -c $< -o $@ # Link -LDFLAGS_DEBUG=-g -ggdb $(OPTIM_DEBUG) -LDFLAGS_PROFILE=-g -pg $(OPTIM_RELEASE) -LDFLAGS_RELEASE=$(OPTIM_RELEASE) +LDFLAGS_DEBUG=-g -ggdb $(OPTIM_DEBUG) -DSVNREVISION=`test -d .svn && svnversion || echo -` -DBUILDTYPE=debug +LDFLAGS_PROFILE=-g -pg $(OPTIM_RELEASE) -DSVNREVISION=`test -d .svn && svnversion || echo -` -DBUILDTYPE=profile +LDFLAGS_RELEASE=$(OPTIM_RELEASE) -DSVNREVISION=`test -d .svn && svnversion || echo -` -DBUILDTYPE=release ##### UNIX specific variables ##### -- 2.39.2