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 dcf45be2d10382cbe395222558735cb04ae82a66..912252b1146bd28f6d173a48aa83a2d9e21feafa 100644 (file)
--- 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 53567839f98d7c33f2425f1f1f329cf88e9911c2..ab8a448fed61ac1e6b52c637a324b67c53a69cbd 100644 (file)
--- 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 #####