ioquake/ioq3
0
0
Fork 0
mirror of https://github.com/ioquake/ioq3.git synced 2024-11-10 07:11:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Add SVN version to the version string displayed in the client console

Browse source 
if it can be detected
This commit is contained in:
Tony J. White = 2006-08-22 16:13:51 +00:00
parent 467917233a
commit 0df6305274
3 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Makefile
View file

@ -134,10 +134,15 @@ LIBSDIR=$(MOUNT_DIR)/libs
VERSION=$(shell grep Q3_VERSION $(CMDIR)/q_shared.h | \ VERSION=$(shell grep Q3_VERSION $(CMDIR)/q_shared.h | \
sed -e 's/.*".* \([^ ]*\)"/\1/') sed -e 's/.*".* \([^ ]*\)"/\1/')
USE_SVN=
ifeq ($(wildcard .svn),.svn) ifeq ($(wildcard .svn),.svn)
SVN_VERSION=$(VERSION)_SVN$(shell LANG=C svnversion .) SVN_REV=$(shell LANG=C svnversion .)
else ifneq ($(SVN_REV),)
SVN_VERSION=$(VERSION)_SVN$(SVN_REV)
USE_SVN=1
else
SVN_VERSION=$(VERSION) SVN_VERSION=$(VERSION)
endif
endif endif
@ -721,6 +726,10 @@ ifeq ($(GENERATE_DEPENDENCIES),1)
endif endif
endif endif
ifneq ($(USE_SVN),)
BASE_CFLAGS += -DSVN_VERSION=\\\"$(SVN_VERSION)\\\"
endif
DO_CC=$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) -o $@ -c $< DO_CC=$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) -o $@ -c $<
DO_SMP_CC=$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) -DSMP -o $@ -c $< DO_SMP_CC=$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) -DSMP -o $@ -c $<
DO_BOT_CC=$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) $(BOTCFLAGS) -DBOTLIB -o $@ -c $< # $(SHLIBCFLAGS) # bk001212 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_cgame.o : $(CDIR)/cl_cgame.c; $(DO_CC)
$(B)/client/cl_cin.o : $(CDIR)/cl_cin.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) $(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_input.o : $(CDIR)/cl_input.c; $(DO_CC)
$(B)/client/cl_keys.o : $(CDIR)/cl_keys.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) $(B)/client/cl_main.o : $(CDIR)/cl_main.c; $(DO_CC)

4
code/client/cl_console.c
View file

@ -619,13 +619,13 @@ void Con_DrawSolidConsole( float frac ) {
re.SetColor( g_color_table[ColorIndex(COLOR_RED)] ); re.SetColor( g_color_table[ColorIndex(COLOR_RED)] );
i = strlen( Q3_VERSION ); i = strlen( SVN_VERSION );
for (x=0 ; x<i ; x++) { for (x=0 ; x<i ; x++) {
SCR_DrawSmallChar( cls.glconfig.vidWidth - ( i - x ) * SMALLCHAR_WIDTH, 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] );
} }

3
code/client/client.h
View file

@ -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 #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 // snapshots are a view of the server at a given time
typedef struct { typedef struct {