Merge remote-tracking branch 'origin/master' into divVerent/csad

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

diff --git a/qcsrc/Makefile b/qcsrc/Makefile
index 69e3105e3afaced874db4b91b4cdca5a933b8e31..5d079dcb05d7d62c96810b82204005d3a1f9543e 100644 (file)
--- a/qcsrc/Makefile
+++ b/qcsrc/Makefile
@@ -1,9 +1,9 @@
 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
-QCC ?= fteqcc
+QCC ?= gmqcc
 
-VERSION_MESSAGE = $(shell $(QCC) --version --help)
+VERSION_MESSAGE = $(shell cd server && $(QCC) --version --help)
 ifneq (,$(findstring GMQCC,$(VERSION_MESSAGE)))
 # this is gmqcc
 QCCFLAGS ?= \
@@ -11,16 +11,28 @@ QCCFLAGS ?= \
        -Werror -Wall \
        -Wno-field-redeclared \
        -Wno-double-declaration \
-       -Wno-assign-function-types \
-       -Wno-unused-variable \
+       -Wno-uninitialized-global \
        -O3 \
-       -fftepp \
-       -ftranslatable-strings \
        -fadjust-vector-fields \
-       -fassign-function-types \
-       -fcorrect-ternary \
+       -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 \
        $(QCCFLAGS_EXTRA) $(QCCFLAGS_WATERMARK)
 else
 # this. is. fteqccccccccccccccccccc!