Merge remote-tracking branch 'origin/samual/serverlist'

[xonotic/xonotic-data.pk3dir.git] / Makefile

diff --git a/Makefile b/Makefile
index abd82b133fa159c61d145f8e4f1a037c2323eb7a..bdac716b79444e302668067c6f62c5b8b8b86c71 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,22 +4,18 @@ 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: 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
+qc: check-cvars
        $(MAKE) -C qcsrc
 
 .PHONY: skin