From: Rudolf Polzer Date: Sun, 31 Oct 2010 14:07:07 +0000 (+0100) Subject: enable logicops in a better place (so it works for command line fteqcc call too) X-Git-Tag: xonotic-v0.1.0preview~222 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a1dccc14adf9b8db0eb010f129de53e004a89b5b;p=xonotic%2Fxonotic-data.pk3dir.git enable logicops in a better place (so it works for command line fteqcc call too) --- diff --git a/Makefile b/Makefile index 9910a39e7..aa4554f19 100644 --- a/Makefile +++ b/Makefile @@ -6,8 +6,8 @@ ZIPEXCLUDE ?= -x\!*.pk3 -xr\!\.svn -x\!qcsrc DIFF ?= diff FTEQCCFLAGS_WATERMARK ?= -DWATERMARK='"^1$(shell git describe) TEST BUILD"' -#FTEQCCFLAGS ?= -Werror -Wno-Q205 -Wno-Q302 -O3 -Ono-c -Ono-cs -flo $(FTEQCCFLAGS_EXTRA) $(FTEQCCFLAGS_WATERMARK) -FTEQCCFLAGS ?= -Wno-Q302 -O3 -Ono-c -Ono-cs -flo $(FTEQCCFLAGS_EXTRA) $(FTEQCCFLAGS_WATERMARK) +#FTEQCCFLAGS ?= -Werror -Wno-Q205 -Wno-Q302 -O3 -Ono-c -Ono-cs $(FTEQCCFLAGS_EXTRA) $(FTEQCCFLAGS_WATERMARK) +FTEQCCFLAGS ?= -Wno-Q302 -O3 -Ono-c -Ono-cs $(FTEQCCFLAGS_EXTRA) $(FTEQCCFLAGS_WATERMARK) FTEQCCFLAGS_PROGS ?= FTEQCCFLAGS_MENU ?= diff --git a/qcsrc/common/util-pre.qh b/qcsrc/common/util-pre.qh index 2472374df..589691dbe 100644 --- a/qcsrc/common/util-pre.qh +++ b/qcsrc/common/util-pre.qh @@ -1,3 +1,5 @@ +#pragma flag enable lo + //float log(float x); #define log log_builtin \ #undef log \