diff options
| -rw-r--r-- | Makefile | 18 | ||||
| -rw-r--r-- | code/client/cl_console.c | 4 | ||||
| -rw-r--r-- | code/client/client.h | 3 |
3 files changed, 20 insertions, 5 deletions
@@ -134,10 +134,15 @@ LIBSDIR=$(MOUNT_DIR)/libs VERSION=$(shell grep Q3_VERSION $(CMDIR)/q_shared.h | \ sed -e 's/.*".* \([^ ]*\)"/\1/') +USE_SVN= ifeq ($(wildcard .svn),.svn) - SVN_VERSION=$(VERSION)_SVN$(shell LANG=C svnversion .) -else - SVN_VERSION=$(VERSION) + SVN_REV=$(shell LANG=C svnversion .) + ifneq ($(SVN_REV),) + SVN_VERSION=$(VERSION)_SVN$(SVN_REV) + USE_SVN=1 + else + SVN_VERSION=$(VERSION) + endif endif @@ -721,6 +726,10 @@ ifeq ($(GENERATE_DEPENDENCIES),1) endif endif +ifneq ($(USE_SVN),) + BASE_CFLAGS += -DSVN_VERSION=\\\"$(SVN_VERSION)\\\" +endif + DO_CC=$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) -o $@ -c $< DO_SMP_CC=$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) -DSMP -o $@ -c $< DO_BOT_CC=$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) $(BOTCFLAGS) -DBOTLIB -o $@ -c $< # $(SHLIBCFLAGS) # bk001212 @@ -1031,6 +1040,9 @@ 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),) + $(B)/client/cl_console.o : .svn/entries +endif $(B)/client/cl_input.o : $(CDIR)/cl_input.c; $(DO_CC) $(B)/client/cl_keys.o : $(CDIR)/cl_keys.c; $(DO_CC) $(B)/client/cl_main.o : $(CDIR)/cl_main.c; $(DO_CC) diff --git a/code/client/cl_console.c b/code/client/cl_console.c index 09e48e7..b8f5f90 100644 --- a/code/client/cl_console.c +++ b/code/client/cl_console.c @@ -619,13 +619,13 @@ void Con_DrawSolidConsole( float frac ) { re.SetColor( g_color_table[ColorIndex(COLOR_RED)] ); - i = strlen( Q3_VERSION ); + i = strlen( SVN_VERSION ); for (x=0 ; x<i ; x++) { SCR_DrawSmallChar( cls.glconfig.vidWidth - ( i - x ) * SMALLCHAR_WIDTH, - (lines-(SMALLCHAR_HEIGHT+SMALLCHAR_HEIGHT/2)), Q3_VERSION[x] ); + (lines-(SMALLCHAR_HEIGHT+SMALLCHAR_HEIGHT/2)), SVN_VERSION[x] ); } diff --git a/code/client/client.h b/code/client/client.h index 4da998b..3643e4f 100644 --- a/code/client/client.h +++ b/code/client/client.h @@ -35,6 +35,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define RETRANSMIT_TIMEOUT 3000 // time between connection packet retransmits +#ifndef SVN_VERSION + #define SVN_VERSION Q3_VERSION +#endif // snapshots are a view of the server at a given time typedef struct { |