X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2FMakefile;h=abbd25ffd8ba40041322b62fee2577aafe85a286;hb=f4d6d011679af38d770c6e498a0df9fe86b37d4c;hp=edac7388c10b06cedfa04d9a13038fcb32a08d79;hpb=a59c12d71fa599891fc1d658aeea2f546d89d9e4;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/Makefile b/qcsrc/Makefile
index edac7388c..abbd25ffd 100644
--- a/qcsrc/Makefile
+++ b/qcsrc/Makefile
@@ -7,8 +7,7 @@ QCCVERSIONFILE := qccversion.$(shell (cd server && $(QCC) --version) > qccversio
 
 # We eventually need to get rid of these.
 QCCFLAGS_WTFS ?= \
-	-Wno-field-redeclared \
-	-Wno-double-declaration \
+	-Wno-field-redeclared
 
 QCCFLAGS ?= \
 	-std=gmqcc \
@@ -35,23 +34,23 @@ $(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 client 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)
+	cd client && $(QCC) $(QCCFLAGS) -DCSQC
 
 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)
+FILES_PROGS = $(shell find server 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)
+	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 menu 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)
+	cd menu && $(QCC) $(QCCFLAGS) -DMENUQC
 
 .PHONY: testcase
 testcase: