From: Rudolf Polzer <divverent@xonotic.org>
Date: Sun, 23 Jun 2013 16:41:19 +0000 (+0200)
Subject: rebuild on new gmqcc version
X-Git-Tag: xonotic-v0.8.0~386
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=86b6be042701352e89b7e04d669357a4deaebc4c;p=xonotic%2Fxonotic-data.pk3dir.git

rebuild on new gmqcc version
---

diff --git a/qcsrc/Makefile b/qcsrc/Makefile
index 3e98265a9..b8fb0a148 100644
--- a/qcsrc/Makefile
+++ b/qcsrc/Makefile
@@ -3,9 +3,8 @@ PERL ?= perl
 QCCFLAGS_WATERMARK ?= -DWATERMARK='"$(shell git describe)"' -DCVAR_POPCON=1
 QCC ?= gmqcc
 
-VERSION_MESSAGE = $(shell cd server && $(QCC) --version --help)
-ifneq (,$(findstring GMQCC,$(VERSION_MESSAGE)))
-# this is gmqcc
+QCCVERSIONFILE = qccversion.$(shell $(QCC) --version > qccversion.txt && git hash-object qccversion.txt)
+
 QCCFLAGS ?= \
 	-std=fteqcc \
 	-Werror -Wall \
@@ -35,10 +34,6 @@ QCCFLAGS ?= \
 	-fno-permissive \
 	-fvariadic-args \
 	$(QCCFLAGS_EXTRA) $(QCCFLAGS_WATERMARK)
-else
-# this. is. fteqccccccccccccccccccc!
-QCCFLAGS ?= -Werror -Wno-Q302 -O3 -Ono-return_only -fno-fastarrays $(QCCFLAGS_EXTRA) $(QCCFLAGS_WATERMARK)
-endif
 
 # xonotic build system overrides this by command line argument to turn off the update-cvarcount step
 XON_BUILDSYSTEM =
@@ -56,18 +51,22 @@ qc-recursive: ../menu.dat ../progs.dat ../csprogs.dat
 clean:
 	rm -f ../progs.dat ../menu.dat ../csprogs.dat
 
+$(QCCVERSIONFILE):
+	$(RM) qccversion.*
+	echo This file intentionally left blank. > $@
+
 FILES_CSPROGS = $(shell find client common warpzonelib csqcmodellib -type f -not -name fteqcc.log -not -name qc.asm) $(wildcard server/w_*.qc)
-../csprogs.dat: $(FILES_CSPROGS)
+../csprogs.dat: $(FILES_CSPROGS) $(QCCVERSIONFILE)
 	@echo make[1]: Entering directory \`$(PWD)/client\'
 	cd client && $(QCC) $(QCCFLAGS)
 
 FILES_PROGS = $(shell find server common warpzonelib csqcmodellib -type f -not -name fteqcc.log -not -name qc.asm) $(wildcard server/w_*.qc)
-../progs.dat: $(FILES_PROGS)
+../progs.dat: $(FILES_PROGS) $(QCCVERSIONFILE)
 	@echo make[1]: Entering directory \`$(PWD)/server\'
 	cd server && $(QCC) $(QCCFLAGS)
 
 FILES_MENU = $(shell find menu common warpzonelib -type f -not -name fteqcc.log -not -name qc.asm) $(wildcard server/w_*.qc)
-../menu.dat: $(FILES_MENU)
+../menu.dat: $(FILES_MENU) $(QCCVERSIONFILE)
 	@echo make[1]: Entering directory \`$(PWD)/menu\'
 	cd menu && $(QCC) $(QCCFLAGS)