Merge remote-tracking branch 'origin/Mario/mutators'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / Makefile

diff --git a/qcsrc/Makefile b/qcsrc/Makefile
index b8fb0a148b03ebe96dfab325e449e979d191656f..a92b06bc645b4f814cee7ddf1cedb2cda0de54a3 100644 (file)
--- a/qcsrc/Makefile
+++ b/qcsrc/Makefile
@@ -3,11 +3,12 @@ PERL ?= perl
 QCCFLAGS_WATERMARK ?= -DWATERMARK='"$(shell git describe)"' -DCVAR_POPCON=1
 QCC ?= gmqcc
 
-QCCVERSIONFILE = qccversion.$(shell $(QCC) --version > qccversion.txt && git hash-object qccversion.txt)
+QCCVERSIONFILE := qccversion.$(shell $(QCC) --version > qccversion.txt && git hash-object qccversion.txt)
 
 QCCFLAGS ?= \
        -std=fteqcc \
        -Werror -Wall \
+       -Wcpp \
        -Wno-field-redeclared \
        -Wno-double-declaration \
        -Wno-uninitialized-global \
@@ -49,7 +50,7 @@ qc-recursive: ../menu.dat ../progs.dat ../csprogs.dat
 
 .PHONY: clean
 clean:
-       rm -f ../progs.dat ../menu.dat ../csprogs.dat
+       rm -f ../progs.dat ../menu.dat ../csprogs.dat server/precache-for-csqc.inc
 
 $(QCCVERSIONFILE):
        $(RM) qccversion.*
@@ -60,8 +61,11 @@ FILES_CSPROGS = $(shell find client common warpzonelib csqcmodellib -type f -not
        @echo make[1]: Entering directory \`$(PWD)/client\'
        cd client && $(QCC) $(QCCFLAGS)
 
+server/precache-for-csqc.inc: $(FILES_CSPROGS)
+       sh collect-precache.sh
+
 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) $(QCCVERSIONFILE)
+../progs.dat: $(FILES_PROGS) $(QCCVERSIONFILE) server/precache-for-csqc.inc
        @echo make[1]: Entering directory \`$(PWD)/server\'
        cd server && $(QCC) $(QCCFLAGS)