From: divverent Date: Sun, 1 May 2011 20:24:33 +0000 (+0000) Subject: shells are too stupid to understand precedence of && and ||, so let's group explicitly X-Git-Tag: xonotic-v0.6.0~163^2~457 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e1561444a7528d17961958a23bf9bc64007c8355;p=xonotic%2Fdarkplaces.git shells are too stupid to understand precedence of && and ||, so let's group explicitly git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11089 d7cf8633-e32d-0410-b094-e92efae38249 --- diff --git a/makefile.inc b/makefile.inc index 341831fc..6bb61ba2 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 || 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 +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 #####