From: Rudolf Polzer <divverent@xonotic.org>
Date: Wed, 19 Dec 2012 16:30:50 +0000 (+0100)
Subject: Merge branch 'master' of http://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir
X-Git-Tag: xonotic-v0.7.0~167
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d5c0efcb78a5ed485ccfc0da2f11274965973101;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' of http://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir
---

d5c0efcb78a5ed485ccfc0da2f11274965973101
diff --cc qcsrc/Makefile
index 69e3105e3,75aa33912..538a44bac
--- a/qcsrc/Makefile
+++ b/qcsrc/Makefile
@@@ -3,25 -3,10 +3,25 @@@ PERL ?= per
  QCCFLAGS_WATERMARK ?= -DWATERMARK='"$(shell git describe)"' -DCVAR_POPCON=1
  QCC ?= fteqcc
  
- VERSION_MESSAGE = $(shell $(QCC) --version --help)
+ VERSION_MESSAGE = $(shell cd server && $(QCC) --version --help)
  ifneq (,$(findstring GMQCC,$(VERSION_MESSAGE)))
  # this is gmqcc
 -QCCFLAGS ?= -Werror -Wall -Wno-field-redeclared -Wno-double-declaration -Wno-assign-function-types -Wno-unused-variable -std=fteqcc -O3 -fshort-logic -ftranslatable-strings -flno $(QCCFLAGS_EXTRA) $(QCCFLAGS_WATERMARK)
 +QCCFLAGS ?= \
 +	-std=fteqcc \
 +	-Werror -Wall \
 +	-Wno-field-redeclared \
 +	-Wno-double-declaration \
 +	-Wno-assign-function-types \
 +	-Wno-unused-variable \
 +	-O3 \
 +	-fftepp \
 +	-ftranslatable-strings \
 +	-fadjust-vector-fields \
 +	-fassign-function-types \
 +	-fcorrect-ternary \
 +	-fshort-logic \
 +	-flno \
 +	$(QCCFLAGS_EXTRA) $(QCCFLAGS_WATERMARK)
  else
  # this. is. fteqccccccccccccccccccc!
  QCCFLAGS ?= -Werror -Wno-Q302 -O3 -Ono-return_only -fno-fastarrays $(QCCFLAGS_EXTRA) $(QCCFLAGS_WATERMARK)