QCCVERSIONFILE := qccversion.$(shell $(QCC) --version > qccversion.txt && git hash-object qccversion.txt)
-QCCFLAGS ?= \
- -std=fteqcc \
- -Werror -Wall \
+# We eventually need to get rid of these.
+QCCFLAGS_WTFS ?= \
-Wno-field-redeclared \
-Wno-double-declaration \
- -Wno-uninitialized-global \
- -O3 \
- -fadjust-vector-fields \
- -fftepp \
- -fftepp-predefs \
- -frelaxed-switch \
- -fshort-logic \
- -fno-perl-logic \
- -ftranslatable-strings \
- -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 \
- -fno-permissive \
- -fvariadic-args \
+
+QCCFLAGS ?= \
+ -std=gmqcc \
+ -O3 -flno \
+ -Werror -fno-bail-on-werror -Wall \
+ -fftepp -fftepp-predefs -Wcpp -futf8 \
+ $(QCCFLAGS_WTFS) \
$(QCCFLAGS_EXTRA) $(QCCFLAGS_WATERMARK)
# xonotic build system overrides this by command line argument to turn off the update-cvarcount step
.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 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)