From d9ecfe6cb82633a89655d702ad8606fa751e27ae Mon Sep 17 00:00:00 2001 From: div0 Date: Fri, 27 Mar 2009 19:13:42 +0000 Subject: [PATCH] remove some stuff in case the build system is used git-svn-id: svn://svn.icculus.org/nexuiz/trunk@6334 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/Makefile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/data/Makefile b/data/Makefile index b82a7d850..53f68a127 100644 --- a/data/Makefile +++ b/data/Makefile @@ -12,12 +12,16 @@ FTEQCCFLAGS_MENU ?= # It will automagically add an engine check with -TID and then change back to -TFTE FTEQCCFLAGS_CSPROGS ?= +# nexuiz svn build system overrides this by command line argument +NEX_BUILDSYSTEM = + all: qc .PHONY: update-cvarcount update-cvarcount: - ! [ -f ../misc/netradiant-NexuizPack/nexuiz.game/data/entities.def ] || diff ../misc/netradiant-NexuizPack/nexuiz.game/data/entities.def scripts/entities.def || { echo entities.def mismatch, please merge ../misc/netradiant-NexuizPack/nexuiz.game/data/entities.def and scripts/entities.def; exit 1; } - DO_NOT_RUN_MAKE=1 sh update-cvarcount.sh + [ "$(NEX_BUILDSYSTEM)" = "" ] || [ "$(NEX_BUILDSYSTEM)" = "1" ] + [ "$(NEX_BUILDSYSTEM)" != "" ] || { ! [ -f ../misc/netradiant-NexuizPack/nexuiz.game/data/entities.def ] || diff ../misc/netradiant-NexuizPack/nexuiz.game/data/entities.def scripts/entities.def || { echo entities.def mismatch, please merge ../misc/netradiant-NexuizPack/nexuiz.game/data/entities.def and scripts/entities.def; exit 1; } } + [ "$(NEX_BUILDSYSTEM)" != "" ] || { DO_NOT_RUN_MAKE=1 sh update-cvarcount.sh; } .PHONY: qc qc: menu.dat progs.dat csprogs.dat -- 2.39.2