From 48491a8f4c5132ca563d988552965a6dfc3cae4a Mon Sep 17 00:00:00 2001
From: tjw <tjw@edf5b092-35ff-0310-97b2-ce42778d08ea>
Date: Sat, 26 Aug 2006 06:12:15 +0000
Subject: * 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
---
 Makefile                | 2 +-
 code/client/client.h    | 4 ----
 code/qcommon/q_shared.h | 3 +++
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index a8944b5..6596dbe 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 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"
-- 
cgit v1.2.3