Fix FL_WEAPON flag overlapping FL_JUMPRELEASED. This unintentional change was introdu...

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

diff --git a/Makefile b/Makefile
index abd82b133fa159c61d145f8e4f1a037c2323eb7a..9ba235e48d70325d9535cbedb1454755ae52dc67 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,30 +4,40 @@ 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
 
+gfx/menu/default/skinvalues.txt: qcsrc/menu/skin-customizables.inc
+       $(PERL) qcsrc/menu/skin-customizables.inc > gfx/menu/default/skinvalues.txt
+
 .PHONY: clean
 clean:
        $(MAKE) -C qcsrc 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
+
+.PHONY: test
+test:
+       $(MAKE) -C qcsrc test