Merge remote-tracking branch 'origin/ablu/vehiclebalance'

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

diff --git a/qcsrc/Makefile b/qcsrc/Makefile
index c6cc796ee8650679eb40977ee3c96f507709e075..a92b06bc645b4f814cee7ddf1cedb2cda0de54a3 100644 (file)
--- a/qcsrc/Makefile
+++ b/qcsrc/Makefile
@@ -1,35 +1,40 @@
 SCM := $(shell if [ -d .svn ]; then echo svn; elif [ -d ../.git ]; then echo git; fi)
 PERL ?= perl
 QCCFLAGS_WATERMARK ?= -DWATERMARK='"$(shell git describe)"' -DCVAR_POPCON=1
-QCC ?= fteqcc
+QCC ?= gmqcc
+
+QCCVERSIONFILE := qccversion.$(shell $(QCC) --version > qccversion.txt && git hash-object qccversion.txt)
 
-VERSION_MESSAGE = $(shell cd server && $(QCC) --version --help)
-ifneq (,$(findstring GMQCC,$(VERSION_MESSAGE)))
-# this is gmqcc
 QCCFLAGS ?= \
        -std=fteqcc \
        -Werror -Wall \
+       -Wcpp \
        -Wno-field-redeclared \
        -Wno-double-declaration \
-       -Wno-assign-function-types \
-       -Wno-unused-variable \
        -Wno-uninitialized-global \
        -O3 \
+       -fadjust-vector-fields \
        -fftepp \
+       -fftepp-predefs \
+       -frelaxed-switch \
+       -fshort-logic \
+       -fno-perl-logic \
        -ftranslatable-strings \
-       -fadjust-vector-fields \
-       -fassign-function-types \
+       -fno-initialized-nonconstants \
+       -fno-assign-function-types \
+       -flno \
        -fcorrect-ternary \
+       -fno-single-vector-defs \
        -fcorrect-logic \
        -ftrue-empty-strings \
+       -fno-false-empty-strings \
+       -futf8 \
+       -fno-bail-on-werror \
+       -floop-labels \
        -funtyped-nil \
-       -fshort-logic \
-       -flno \
+       -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 =
@@ -45,20 +50,27 @@ 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.*
+       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)
 
+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)
+../progs.dat: $(FILES_PROGS) $(QCCVERSIONFILE) server/precache-for-csqc.inc
        @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)