X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=Makefile;h=ab7fa6c1b79fb076e17a833941af341c0d009d08;hb=4915aa8e50e8ed6b3f5dea7084c15339f86bb981;hp=abd82b133fa159c61d145f8e4f1a037c2323eb7a;hpb=80cd34d0a48e975018605aabebacba50e8029585;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/Makefile b/Makefile index abd82b133..ab7fa6c1b 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 @@ -31,3 +29,11 @@ clean: gfx/menu/default/skinvalues.txt: qcsrc/menu/skin-customizables.inc $(PERL) qcsrc/menu/skin-customizables.inc > gfx/menu/default/skinvalues.txt + +.PHONY: sv +sv: + $(MAKE) -C qcsrc sv + +.PHONY: pk3 +pk3: + $(MAKE) -C qcsrc pk3