diff options
| author | tjw <tjw@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2006-08-26 06:12:15 +0000 |
|---|---|---|
| committer | tjw <tjw@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2006-08-26 06:12:15 +0000 |
| commit | 48491a8f4c5132ca563d988552965a6dfc3cae4a (patch) | |
| tree | a45b642176469df1e2b7b582586058163275feb4 | |
| parent | e59363906978ea9a51838537a35daf7b422c7bb5 (diff) | |
| download | ioquake3-aero-48491a8f4c5132ca563d988552965a6dfc3cae4a.tar.gz ioquake3-aero-48491a8f4c5132ca563d988552965a6dfc3cae4a.zip | |
* moved SVN_VERSION #ifdef from client.h to q_shared.h so dedicated server
builds when svn version cannot be detected
git-svn-id: svn://svn.icculus.org/quake3/trunk@872 edf5b092-35ff-0310-97b2-ce42778d08ea
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | code/client/client.h | 4 | ||||
| -rw-r--r-- | code/qcommon/q_shared.h | 3 |
3 files changed, 4 insertions, 5 deletions
@@ -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 3a876d2..9db786a 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 8b83378..335ef38 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" |