r872 - in trunk: . code/client code/qcommon

[DONOTREPLY at icculus.org]

Author: tjw
Date: 2006-08-26 02:12:15 -0400 (Sat, 26 Aug 2006)
New Revision: 872

Modified:
   trunk/Makefile
   trunk/code/client/client.h
   trunk/code/qcommon/q_shared.h
Log:
* moved SVN_VERSION #ifdef from client.h to q_shared.h so dedicated server
  builds when svn version cannot be detected


Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2006-08-26 02:45:59 UTC (rev 871)
+++ trunk/Makefile	2006-08-26 06:12:15 UTC (rev 872)
@@ -131,7 +131,7 @@
 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=

Modified: trunk/code/client/client.h
===================================================================
--- trunk/code/client/client.h	2006-08-26 02:45:59 UTC (rev 871)
+++ trunk/code/client/client.h	2006-08-26 06:12:15 UTC (rev 872)
@@ -35,10 +35,6 @@
 
 #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

Modified: trunk/code/qcommon/q_shared.h
===================================================================
--- trunk/code/qcommon/q_shared.h	2006-08-26 02:45:59 UTC (rev 871)
+++ trunk/code/qcommon/q_shared.h	2006-08-26 06:12:15 UTC (rev 872)
@@ -27,6 +27,9 @@
 // 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"