From a4b957dd0621d4bccb1f4de299d5a70ef2e151ef Mon Sep 17 00:00:00 2001 From: divverent Date: Sun, 1 May 2011 18:58:04 +0000 Subject: [PATCH] detect git revision too, not just svn version git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11086 d7cf8633-e32d-0410-b094-e92efae38249 ::stable-branch::merge=47bafbe6c0835c18460b27d121c0a879ac1f3940 --- makefile.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/makefile.inc b/makefile.inc index 2b62b756..341831fc 100644 --- a/makefile.inc +++ b/makefile.inc @@ -209,9 +209,9 @@ DO_CC=$(CC) $(CFLAGS) -c $< -o $@ # Link -LDFLAGS_DEBUG=-g -ggdb $(OPTIM_DEBUG) -DSVNREVISION=`test -d .svn && svnversion || echo -` -DBUILDTYPE=debug -LDFLAGS_PROFILE=-g -pg -fprofile-arcs $(OPTIM_RELEASE) -DSVNREVISION=`test -d .svn && svnversion || echo -` -DBUILDTYPE=profile -LDFLAGS_RELEASE=$(OPTIM_RELEASE) -DSVNREVISION=`test -d .svn && svnversion || echo -` -DBUILDTYPE=release +LDFLAGS_DEBUG=-g -ggdb $(OPTIM_DEBUG) -DSVNREVISION=`test -d .svn && svnversion || test -d .git && git describe || echo -` -DBUILDTYPE=debug +LDFLAGS_PROFILE=-g -pg -fprofile-arcs $(OPTIM_RELEASE) -DSVNREVISION=`test -d .svn && svnversion || test -d .git && git describe || echo -` -DBUILDTYPE=profile +LDFLAGS_RELEASE=$(OPTIM_RELEASE) -DSVNREVISION=`test -d .svn && svnversion || test -d .git && git describe || echo -` -DBUILDTYPE=release ##### UNIX specific variables ##### -- 2.39.2