X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2FMakefile;h=452dfc9a6451ad219bfcfd3b84c9a06b924c504f;hb=dd86367759e5813df8f844a34275830658396153;hp=a92b06bc645b4f814cee7ddf1cedb2cda0de54a3;hpb=8bd579d6ca74881bd77ae83fd00ac81c9e0108cf;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/Makefile b/qcsrc/Makefile
index a92b06bc6..452dfc9a6 100644
--- a/qcsrc/Makefile
+++ b/qcsrc/Makefile
@@ -1,78 +1,61 @@
 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
+QCCFLAGS_WATERMARK ?= -DWATERMARK='"$(shell git describe)"'
 QCC ?= gmqcc
+ 
+QCCVERSIONFILE := qccversion.$(shell (cd server && $(QCC) --version) > qccversion.txt && git hash-object qccversion.txt)
 
-QCCVERSIONFILE := qccversion.$(shell $(QCC) --version > qccversion.txt && git hash-object qccversion.txt)
+# We eventually need to get rid of these.
+QCCFLAGS_WTFS ?= \
+	-Wno-field-redeclared
+
+QCCFLAGS_FEATURES ?= \
+	-DVEHICLES_ENABLED=1 \
+	-DVEHICLES_USE_ODE=0 \
+	-DBUILD_MOD=$(BUILD_MOD)
 
 QCCFLAGS ?= \
-	-std=fteqcc \
-	-Werror -Wall \
-	-Wcpp \
-	-Wno-field-redeclared \
-	-Wno-double-declaration \
-	-Wno-uninitialized-global \
+	-std=gmqcc \
 	-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_EXTRA) $(QCCFLAGS_WATERMARK)
+	-Werror -Wall -Wcpp \
+	$(QCCFLAGS_WTFS) \
+	-fftepp -flno -futf8 -fno-bail-on-werror -fftepp-predefs \
+	-frelaxed-switch -freturn-assignments \
+	$(QCCFLAGS_WATERMARK) \
+	$(QCCFLAGS_FEATURES) \
+	$(QCCFLAGS_EXTRA)
 
 # xonotic build system overrides this by command line argument to turn off the update-cvarcount step
 XON_BUILDSYSTEM =
 
+.PHONY: all
 all: qc
 
 .PHONY: qc
-qc:
-	$(MAKE) qc-recursive
-
-.PHONY: qc-recursive
-qc-recursive: ../menu.dat ../progs.dat ../csprogs.dat
+qc: ../menu.dat ../progs.dat ../csprogs.dat
 
 .PHONY: clean
 clean:
-	rm -f ../progs.dat ../menu.dat ../csprogs.dat server/precache-for-csqc.inc
+	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)
+FILES_CSPROGS = $(shell find lib common client -type f)
 ../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
+	cd client && $(QCC) $(QCCFLAGS) -DCSQC
 
-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) server/precache-for-csqc.inc
+FILES_PROGS = $(shell find lib common server -type f)
+../progs.dat: $(FILES_PROGS) $(QCCVERSIONFILE)
 	@echo make[1]: Entering directory \`$(PWD)/server\'
-	cd server && $(QCC) $(QCCFLAGS)
+	cd server && $(QCC) $(QCCFLAGS) -DSVQC
 
-FILES_MENU = $(shell find menu common warpzonelib -type f -not -name fteqcc.log -not -name qc.asm) $(wildcard server/w_*.qc)
+FILES_MENU = $(shell find lib common menu -type f)
 ../menu.dat: $(FILES_MENU) $(QCCVERSIONFILE)
 	@echo make[1]: Entering directory \`$(PWD)/menu\'
-	cd menu && $(QCC) $(QCCFLAGS)
+	cd menu && $(QCC) $(QCCFLAGS) -DMENUQC
 
 .PHONY: testcase
 testcase: