From: Rudolf Polzer Date: Tue, 18 Dec 2012 19:11:16 +0000 (+0100) Subject: fix gmqcc use by ./all X-Git-Tag: xonotic-v0.7.0~167^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d5a3bf9be6f4366ca88bb9d00b7670f6446aff3d;p=xonotic%2Fxonotic-data.pk3dir.git fix gmqcc use by ./all --- diff --git a/qcsrc/Makefile b/qcsrc/Makefile index 2266cc8e6..75aa33912 100644 --- a/qcsrc/Makefile +++ b/qcsrc/Makefile @@ -3,7 +3,7 @@ PERL ?= perl 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)