X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2FMakefile;h=3e98265a9521945ec5049ac54d552d2d2dc62e40;hb=66318bb5b5b81df7106a2e7adac8e5ec2807ca66;hp=8d2279a47f846fc7e929f719c36c9a18c8d263fb;hpb=f59376561f8824ef2cabc7be4fd61c4ae5b59f01;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/Makefile b/qcsrc/Makefile
index 8d2279a47..3e98265a9 100644
--- a/qcsrc/Makefile
+++ b/qcsrc/Makefile
@@ -1,13 +1,40 @@
 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)
-ifneq (,$(findstring gmqcc,$(VERSION_MESSAGE)))
+VERSION_MESSAGE = $(shell cd server && $(QCC) --version --help)
+ifneq (,$(findstring GMQCC,$(VERSION_MESSAGE)))
 # this is gmqcc
-QCCFLAGS_WATERMARK =
-QCCFLAGS ?= -Werror -Wall -Wno-field-redeclared -Wno-double-declaration -Wno-assign-function-types -Wno-unused-variable -std=fteqcc -fshort-logic -O1 -flno $(QCCFLAGS_EXTRA) $(QCCFLAGS_WATERMARK)
+QCCFLAGS ?= \
+	-std=fteqcc \
+	-Werror -Wall \
+	-Wno-field-redeclared \
+	-Wno-double-declaration \
+	-Wno-uninitialized-global \
+	-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)
 else
 # this. is. fteqccccccccccccccccccc!
 QCCFLAGS ?= -Werror -Wno-Q302 -O3 -Ono-return_only -fno-fastarrays $(QCCFLAGS_EXTRA) $(QCCFLAGS_WATERMARK)