From: Rudolf Polzer Date: Mon, 17 Dec 2012 14:35:37 +0000 (+0100) Subject: define XONOTIC_USE_GMQCC and FTEQCC=.../gmqcc to compile with gmqcc X-Git-Tag: xonotic-v0.7.0~99^2~11 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=feb54c26f9be197446427e5dd77872f70349c493;p=xonotic%2Fxonotic-data.pk3dir.git define XONOTIC_USE_GMQCC and FTEQCC=.../gmqcc to compile with gmqcc --- diff --git a/qcsrc/Makefile b/qcsrc/Makefile index 27f6fc993..badc3ac1c 100644 --- a/qcsrc/Makefile +++ b/qcsrc/Makefile @@ -1,11 +1,19 @@ SCM := $(shell if [ -d .svn ]; then echo svn; elif [ -d ../.git ]; then echo git; fi) -FTEQCC ?= fteqcc PERL ?= perl +ifdef XONOTIC_USE_FTEQCC +FTEQCC ?= gmqcc +FTEQCCFLAGS_WATERMARK ?= +FTEQCCFLAGS ?= -std=fteqcc -fshort-logic -O1 -flno $(FTEQCCFLAGS_EXTRA) $(FTEQCCFLAGS_WATERMARK) +FTEQCCFLAGS_PROGS ?= +FTEQCCFLAGS_MENU ?= +else +FTEQCC ?= fteqcc FTEQCCFLAGS_WATERMARK ?= -DWATERMARK='"$(shell git describe)"' -DCVAR_POPCON FTEQCCFLAGS ?= -Werror -Wno-Q302 -O3 -Ono-return_only -fno-fastarrays $(FTEQCCFLAGS_EXTRA) $(FTEQCCFLAGS_WATERMARK) FTEQCCFLAGS_PROGS ?= FTEQCCFLAGS_MENU ?= +endif # NOTE: use -DUSE_FTE instead of -TFTE here! # It will automagically add an engine check with -TID and then change back to -TFTE