X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2FMakefile;h=6dd476c2d3b9c1cea04b8ad97a37f75d2b551907;hp=f53707e829f482c39e0f6dcdee0c54d54d4aa3c1;hb=c89dfaa4d0342b98c320621557973a65114fbdf4;hpb=853b6160a59c1e6f1b67af9abd43cf98d25b8625

diff --git a/qcsrc/Makefile b/qcsrc/Makefile
index f53707e82..6dd476c2d 100644
--- a/qcsrc/Makefile
+++ b/qcsrc/Makefile
@@ -2,7 +2,7 @@ SCM := $(shell if [ -d .svn ]; then echo svn; elif [ -d ../.git ]; then echo git
 PERL ?= perl
 QCCFLAGS_WATERMARK ?= -DWATERMARK='"$(shell git describe)"'
 QCC ?= gmqcc
-
+ 
 QCCVERSIONFILE := qccversion.$(shell (cd server && $(QCC) --version) > qccversion.txt && git hash-object qccversion.txt)
 
 # We eventually need to get rid of these.
@@ -13,14 +13,15 @@ QCCFLAGS ?= \
 	-std=gmqcc \
 	-O3 -flno \
 	-Werror -fno-bail-on-werror -Wall \
-	-fftepp -fftepp-predefs -Wcpp -futf8 \
+	-fftepp -fftepp-predefs -Wcpp -futf8 -frelaxed-switch -freturn-assignments \
 	$(QCCFLAGS_WTFS) \
 	$(QCCFLAGS_FEATURES) \
 	$(QCCFLAGS_EXTRA) $(QCCFLAGS_WATERMARK)
 
 QCCFLAGS_FEATURES ?= \
 	-DVEHICLES_ENABLED=1 \
-	-DVEHICLES_USE_ODE=0
+	-DVEHICLES_USE_ODE=0 \
+	-DBUILD_MOD=$(BUILD_MOD)
 
 # xonotic build system overrides this by command line argument to turn off the update-cvarcount step
 XON_BUILDSYSTEM =
@@ -39,7 +40,7 @@ $(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)
+FILES_CSPROGS = $(shell find client lib common warpzonelib csqcmodellib -type f -not -name fteqcc.log -not -name qc.asm)
 ../csprogs.dat: $(FILES_CSPROGS) $(QCCVERSIONFILE)
 	@echo make[1]: Entering directory \`$(PWD)/client\'
 	cd client && $(QCC) $(QCCFLAGS) -DCSQC
@@ -47,12 +48,12 @@ FILES_CSPROGS = $(shell find client common warpzonelib csqcmodellib -type f -not
 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)
+FILES_PROGS = $(shell find server lib common warpzonelib csqcmodellib -type f -not -name fteqcc.log -not -name qc.asm)
 ../progs.dat: $(FILES_PROGS) $(QCCVERSIONFILE) server/precache-for-csqc.inc
 	@echo make[1]: Entering directory \`$(PWD)/server\'
 	cd server && $(QCC) $(QCCFLAGS) -DSVQC
 
-FILES_MENU = $(shell find menu common warpzonelib -type f -not -name fteqcc.log -not -name qc.asm)
+FILES_MENU = $(shell find menu lib common warpzonelib -type f -not -name fteqcc.log -not -name qc.asm)
 ../menu.dat: $(FILES_MENU) $(QCCVERSIONFILE)
 	@echo make[1]: Entering directory \`$(PWD)/menu\'
 	cd menu && $(QCC) $(QCCFLAGS) -DMENUQC