mirror of
https://github.com/UberGames/ioef.git
synced 2024-12-02 17:12:16 +00:00
* moved SVN_VERSION #ifdef from client.h to q_shared.h so dedicated server
builds when svn version cannot be detected
This commit is contained in:
parent
5ee7b5ed59
commit
1f8c2c56eb
3 changed files with 4 additions and 5 deletions
2
Makefile
2
Makefile
|
@ -131,7 +131,7 @@ SDLHDIR=$(MOUNT_DIR)/SDL12
|
||||||
LIBSDIR=$(MOUNT_DIR)/libs
|
LIBSDIR=$(MOUNT_DIR)/libs
|
||||||
|
|
||||||
# extract version info
|
# 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/')
|
sed -e 's/.*".* \([^ ]*\)"/\1/')
|
||||||
|
|
||||||
USE_SVN=
|
USE_SVN=
|
||||||
|
|
|
@ -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
|
#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 {
|
||||||
qboolean valid; // cleared if delta parsing was invalid
|
qboolean valid; // cleared if delta parsing was invalid
|
||||||
|
|
|
@ -27,6 +27,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
// A user mod should never modify this file
|
// A user mod should never modify this file
|
||||||
|
|
||||||
#define Q3_VERSION "ioQ3 1.33"
|
#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_TITLE "icculus.org/quake3"
|
||||||
#define CLIENT_WINDOW_ICON "ioq3"
|
#define CLIENT_WINDOW_ICON "ioq3"
|
||||||
#define CONSOLE_WINDOW_TITLE "icculus.org/quake3 console"
|
#define CONSOLE_WINDOW_TITLE "icculus.org/quake3 console"
|
||||||
|
|
Loading…
Reference in a new issue