From: divverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Wed, 11 Jun 2008 11:20:33 +0000 (+0000)
Subject: also put svn revision (svnversion(1)) and build type into the version string
X-Git-Tag: xonotic-v0.1.0preview~2216
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=commitdiff_plain;h=1346a06ebda6590749c578328718b7b490e2aa03

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

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