summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index deb40a0c..be943372 100644
--- a/Makefile
+++ b/Makefile
@@ -136,8 +136,8 @@ LIBSDIR=$(MOUNT_DIR)/libs
MASTERDIR=$(MOUNT_DIR)/master
# extract version info
-VERSION=$(shell grep Q3_VERSION $(CMDIR)/q_shared.h | \
- sed -e 's/.*tremulous\ \(.*\)"/\1/')
+VERSION=$(shell grep "#define VERSION_NUMBER" $(CMDIR)/q_shared.h | \
+ sed -e 's/[^"]*"\(.*\)"/\1/')
ifeq ($(wildcard .svn),.svn)
SVN_VERSION=$(VERSION)_SVN$(shell LANG=C svnversion .)
@@ -778,6 +778,7 @@ Q3OBJ = \
$(B)/client/cvar.o \
$(B)/client/files.o \
$(B)/client/md4.o \
+ $(B)/client/md5.o \
$(B)/client/msg.o \
$(B)/client/net_chan.o \
$(B)/client/huffman.o \
@@ -1021,6 +1022,7 @@ $(B)/client/common.o : $(CMDIR)/common.c; $(DO_CC)
$(B)/client/cvar.o : $(CMDIR)/cvar.c; $(DO_CC)
$(B)/client/files.o : $(CMDIR)/files.c; $(DO_CC)
$(B)/client/md4.o : $(CMDIR)/md4.c; $(DO_CC)
+$(B)/client/md5.o : $(CMDIR)/md5.c; $(DO_CC)
$(B)/client/msg.o : $(CMDIR)/msg.c; $(DO_CC)
$(B)/client/net_chan.o : $(CMDIR)/net_chan.c; $(DO_CC)
$(B)/client/huffman.o : $(CMDIR)/huffman.c; $(DO_CC)