tuba: move to common

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

diff --git a/qcsrc/Makefile b/qcsrc/Makefile
index 3c90dd1664c841e384d77fa2d5cdbd6071179961..fd566d714ad41572832e3eac44edc0e90dc2c266 100644 (file)
--- a/qcsrc/Makefile
+++ b/qcsrc/Makefile
@@ -1,79 +1,63 @@
 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
+NDEBUG ?= 1
+ 
+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 ?= \
+       -DBUILD_MOD=$(BUILD_MOD)
+
+# -Ooverlap-locals is required
 QCCFLAGS ?= \
-       -std=fteqcc \
-       -Werror -Wall \
-       -Wcpp \
-       -Wno-field-redeclared \
-       -Wno-double-declaration \
-       -Wno-uninitialized-global \
-       -Wno-parenthesis \
+       -std=gmqcc \
+       -Ooverlap-locals \
        -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) \
+       -DNDEBUG=$(NDEBUG) \
+       $(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 -o ../../csprogs.dat progs.inc
 
-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 -o ../../progs.dat progs.inc
 
-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 -o ../../menu.dat progs.inc
 
 .PHONY: testcase
 testcase: