aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortjw <tjw@edf5b092-35ff-0310-97b2-ce42778d08ea>2006-08-22 16:30:04 +0000
committertjw <tjw@edf5b092-35ff-0310-97b2-ce42778d08ea>2006-08-22 16:30:04 +0000
commit16b7ab969202d64d602d364a20a0bc6fc2afdbb7 (patch)
tree5a850a8bf2b79045daaf927132de5f02cb4acfb7
parentbc5a8944d03f0b96ffa1fd88c33c2f84c4d9249c (diff)
downloadioquake3-aero-16b7ab969202d64d602d364a20a0bc6fc2afdbb7.tar.gz
ioquake3-aero-16b7ab969202d64d602d364a20a0bc6fc2afdbb7.zip
* Add SVN version string to client console (clean up last commit)
git-svn-id: svn://svn.icculus.org/quake3/trunk@859 edf5b092-35ff-0310-97b2-ce42778d08ea
-rw-r--r--Makefile9
1 files changed, 5 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index b875388..9f8a94e 100644
--- a/Makefile
+++ b/Makefile
@@ -140,10 +140,11 @@ ifeq ($(wildcard .svn),.svn)
ifneq ($(SVN_REV),)
SVN_VERSION=$(VERSION)_SVN$(SVN_REV)
USE_SVN=1
- else
- SVN_VERSION=$(VERSION)
endif
endif
+ifneq ($(USE_SVN),1)
+ SVN_VERSION=$(VERSION)
+endif
#############################################################################
@@ -726,7 +727,7 @@ ifeq ($(GENERATE_DEPENDENCIES),1)
endif
endif
-ifneq ($(USE_SVN),)
+ifeq ($(USE_SVN),1)
BASE_CFLAGS += -DSVN_VERSION=\\\"$(SVN_VERSION)\\\"
endif
@@ -1040,7 +1041,7 @@ endif
$(B)/client/cl_cgame.o : $(CDIR)/cl_cgame.c; $(DO_CC)
$(B)/client/cl_cin.o : $(CDIR)/cl_cin.c; $(DO_CC)
$(B)/client/cl_console.o : $(CDIR)/cl_console.c; $(DO_CC)
-ifneq ($(USE_SVN),)
+ifeq ($(USE_SVN),1)
$(B)/client/cl_console.o : .svn/entries
endif
$(B)/client/cl_input.o : $(CDIR)/cl_input.c; $(DO_CC)