X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2FMakefile;h=a10ccd2fd11f5ed318068b0c60e18807f0c14495;hp=3c90dd1664c841e384d77fa2d5cdbd6071179961;hb=6a28c11c8abd729c7f95ad7050d204aa2453d2ff;hpb=678efa11440150b83abd4680f54c2f821328fb47 diff --git a/qcsrc/Makefile b/qcsrc/Makefile index 3c90dd166..a10ccd2fd 100644 --- a/qcsrc/Makefile +++ b/qcsrc/Makefile @@ -5,36 +5,17 @@ QCC ?= gmqcc QCCVERSIONFILE := qccversion.$(shell $(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