diff --git a/Makefile b/Makefile index a8944b51..6596dbe2 100644 --- a/Makefile +++ b/Makefile @@ -131,7 +131,7 @@ SDLHDIR=$(MOUNT_DIR)/SDL12 LIBSDIR=$(MOUNT_DIR)/libs # extract version info -VERSION=$(shell grep Q3_VERSION $(CMDIR)/q_shared.h | \ +VERSION=$(shell grep "\#define Q3_VERSION" $(CMDIR)/q_shared.h | \ sed -e 's/.*".* \([^ ]*\)"/\1/') USE_SVN= diff --git a/code/client/client.h b/code/client/client.h index 3a876d26..9db786a8 100644 --- a/code/client/client.h +++ b/code/client/client.h @@ -35,10 +35,6 @@ 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 { qboolean valid; // cleared if delta parsing was invalid diff --git a/code/qcommon/q_shared.h b/code/qcommon/q_shared.h index 8b83378d..335ef382 100644 --- a/code/qcommon/q_shared.h +++ b/code/qcommon/q_shared.h @@ -27,6 +27,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA // A user mod should never modify this file #define Q3_VERSION "ioQ3 1.33" +#ifndef SVN_VERSION + #define SVN_VERSION Q3_VERSION +#endif #define CLIENT_WINDOW_TITLE "icculus.org/quake3" #define CLIENT_WINDOW_ICON "ioq3" #define CONSOLE_WINDOW_TITLE "icculus.org/quake3 console"