X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=Makefile;h=7507a223cd4c8829b510ecfa476dae8d36c62117;hp=abd82b133fa159c61d145f8e4f1a037c2323eb7a;hb=37c14ca046ac2b3cf3d539ae6e33e00c78f794e2;hpb=4337dab09bbbe024bcc77db446ed76962fb17f0d diff --git a/Makefile b/Makefile index abd82b133..7507a223c 100644 --- a/Makefile +++ b/Makefile @@ -4,23 +4,21 @@ ZIP ?= 7za a -tzip -mx=9 ZIPEXCLUDE ?= -x\!*.pk3 -xr\!\.svn -x\!qcsrc DIFF ?= diff -# NOTE: use -DUSE_FTE instead of -TFTE here! -# It will automagically add an engine check with -TID and then change back to -TFTE -FTEQCCFLAGS_CSPROGS ?= - -# xonotic build system overrides this by command line argument to turn off the update-cvarcount step +# xonotic build system overrides this by command line argument to turn off the check-cvars step XON_BUILDSYSTEM = -all: qc +.PHONY: all +all: check-cvars + $(MAKE) -C qcsrc all -.PHONY: update-cvarcount -update-cvarcount: +.PHONY: check-cvars +check-cvars: [ "$(XON_BUILDSYSTEM)" = "" ] || [ "$(XON_BUILDSYSTEM)" = "1" ] - [ "$(XON_BUILDSYSTEM)" = "1" ] || { DO_NOT_RUN_MAKE=1 sh update-cvarcount.sh; } + [ "$(XON_BUILDSYSTEM)" = "1" ] || { DO_NOT_RUN_MAKE=1 sh check-cvars.sh; } .PHONY: qc -qc: update-cvarcount - $(MAKE) -C qcsrc +qc: check-cvars + $(MAKE) -C qcsrc qc .PHONY: skin skin: gfx/menu/default/skinvalues.txt