Merge branch 'master' into terencehill/string_prefixes_cleanup

[xonotic/xonotic-data.pk3dir.git] / qcsrc / Makefile

diff --git a/qcsrc/Makefile b/qcsrc/Makefile
index 9fde71e103e2bdeb1030c1c06545d60ee9aac231..abbd25ffd8ba40041322b62fee2577aafe85a286 100644 (file)
--- 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 \
@@ -38,7 +37,7 @@ $(QCCVERSIONFILE):
 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
@@ -46,12 +45,12 @@ server/precache-for-csqc.inc: $(FILES_CSPROGS)
 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)
 ../menu.dat: $(FILES_MENU) $(QCCVERSIONFILE)
        @echo make[1]: Entering directory \`$(PWD)/menu\'
-       cd menu && $(QCC) $(QCCFLAGS)
+       cd menu && $(QCC) $(QCCFLAGS) -DMENUQC
 
 .PHONY: testcase
 testcase: