enable logicops in a better place (so it works for command line fteqcc call too)

diff --git a/Makefile b/Makefile
index 9910a39e7096bd28374b0a2457a45d3dd872ce40..aa4554f19c70f2b3b109a915fded99b71629efd8 100644 (file)
--- 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"'
 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 ?=
 
 FTEQCCFLAGS_PROGS ?=
 FTEQCCFLAGS_MENU ?=
 

diff --git a/qcsrc/common/util-pre.qh b/qcsrc/common/util-pre.qh
index 2472374df33dc485ba5373a107aad432972d6f49..589691dbe9100d233ad88468a7acb63e13566201 100644 (file)
--- 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 \
 //float log(float x);
 #define log log_builtin \
        #undef log \