X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2FMakefile;h=a10ccd2fd11f5ed318068b0c60e18807f0c14495;hb=156bed17068e8d27fcfb107ba77288e74a127d00;hp=df1e9a3883226e55c877350d1e732086ad768f9b;hpb=6781e6a622320df88fe4ae04a337227967e8729f;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/Makefile b/qcsrc/Makefile
index df1e9a388..a10ccd2fd 100644
--- a/qcsrc/Makefile
+++ b/qcsrc/Makefile
@@ -5,34 +5,17 @@ QCC ?= gmqcc
 
 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
@@ -49,7 +32,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 +43,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)