From 99abb878ce4496015d8ae8aae31ffdb57b1d1d83 Mon Sep 17 00:00:00 2001 From: divverent Date: Wed, 1 Jun 2011 10:47:42 +0000 Subject: [PATCH] the git describe option --dirty is too new, so don't use it git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11174 d7cf8633-e32d-0410-b094-e92efae38249 ::stable-branch::merge=04cb3d278b366b71d8a088acd2f5ffeb5ac4f448 --- makefile.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/makefile.inc b/makefile.inc index be5bc25e..176e384e 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; } || { test -d .git && git describe --always --dirty; } || echo -` -DBUILDTYPE=debug -LDFLAGS_PROFILE=-g -pg -fprofile-arcs $(OPTIM_RELEASE) -DSVNREVISION=`{ test -d .svn && svnversion; } || { test -d .git && git describe --always --dirty; } || echo -` -DBUILDTYPE=profile -LDFLAGS_RELEASE=$(OPTIM_RELEASE) -DSVNREVISION=`{ test -d .svn && svnversion; } || { test -d .git && git describe --always --dirty; } || echo -` -DBUILDTYPE=release +LDFLAGS_DEBUG=-g -ggdb $(OPTIM_DEBUG) -DSVNREVISION=`{ test -d .svn && svnversion; } || { test -d .git && git describe --always; } || echo -` -DBUILDTYPE=debug +LDFLAGS_PROFILE=-g -pg -fprofile-arcs $(OPTIM_RELEASE) -DSVNREVISION=`{ test -d .svn && svnversion; } || { test -d .git && git describe --always; } || echo -` -DBUILDTYPE=profile +LDFLAGS_RELEASE=$(OPTIM_RELEASE) -DSVNREVISION=`{ test -d .svn && svnversion; } || { test -d .git && git describe --always; } || echo -` -DBUILDTYPE=release ##### UNIX specific variables ##### -- 2.39.2