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 $(QCC) --version > qccversion.txt && git hash-object qccversion.txt)
+QCCVERSIONFILE := qccversion.$(shell (cd server && $(QCC) --version) > qccversion.txt && git hash-object qccversion.txt)
-QCCFLAGS ?= \
- -std=fteqcc \
- -Werror -Wall \
- -Wcpp \
+# We eventually need to get rid of these.
+QCCFLAGS_WTFS ?= \
-Wno-field-redeclared \
-Wno-double-declaration \
- -Wno-uninitialized-global \
- -Wno-parenthesis \
- -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 ?= \
+ -std=gmqcc \
+ -O3 -flno \
+ -Werror -fno-bail-on-werror -Wall \
+ -fftepp -fftepp-predefs -Wcpp -futf8 \
+ $(QCCFLAGS_WTFS) \
$(QCCFLAGS_EXTRA) $(QCCFLAGS_WATERMARK)
# xonotic build system overrides this by command line argument to turn off the update-cvarcount step
XON_BUILDSYSTEM =
all: qc
+.PHONY: all
.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: