X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2FMakefile;h=3e98265a9521945ec5049ac54d552d2d2dc62e40;hb=8f57bf377f08a6344d05713945a5503dc6e72670;hp=fdd9fffff56062357fe277bca02a41131aa2c3c2;hpb=0202aaed3286672d956d58deecdeb315d2871bf5;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/Makefile b/qcsrc/Makefile index fdd9fffff..3e98265a9 100644 --- a/qcsrc/Makefile +++ b/qcsrc/Makefile @@ -1,7 +1,7 @@ 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 cd server && $(QCC) --version --help) ifneq (,$(findstring GMQCC,$(VERSION_MESSAGE))) @@ -11,18 +11,29 @@ QCCFLAGS ?= \ -Werror -Wall \ -Wno-field-redeclared \ -Wno-double-declaration \ - -Wno-assign-function-types \ - -Wno-unused-variable \ + -Wno-uninitialized-global \ -O3 \ + -fadjust-vector-fields \ -fftepp \ + -fftepp-predefs \ + -frelaxed-switch \ + -fshort-logic \ + -fno-perl-logic \ -ftranslatable-strings \ - -fadjust-vector-fields \ - -fassign-function-types \ + -fno-initialized-nonconstants \ + -fno-assign-function-types \ + -flno \ -fcorrect-ternary \ + -fno-single-vector-defs \ -fcorrect-logic \ -ftrue-empty-strings \ - -fshort-logic \ - -flno \ + -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!