Use old style sound names (fixes heavy server lag when triggering target_items a...

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

diff --git a/qcsrc/Makefile b/qcsrc/Makefile
index 51440d4a3c90da83d77f8e57033c7e2287c188d6..5198283b2e7e25b5abbc158a81a462c29d11ed44 100644 (file)
--- a/qcsrc/Makefile
+++ b/qcsrc/Makefile
@@ -1,28 +1,32 @@
 SCM := $(shell if [ -d .svn ]; then echo svn; elif [ -d ../.git ]; then echo git; fi)
 PERL ?= perl
-QCCFLAGS_WATERMARK ?= -DWATERMARK='"$(shell git describe)"'
+QCCFLAGS_WATERMARK ?= $(shell git describe)
+CPP := cc -xc -E
 QCC ?= gmqcc
- 
+NDEBUG ?= 1
+BUILD_MOD ?= 0
+
 QCCVERSIONFILE := qccversion.$(shell (cd server && $(QCC) --version) > qccversion.txt && git hash-object qccversion.txt)
 
-# We eventually need to get rid of these.
+# We eventually need to get rid of these
 QCCFLAGS_WTFS ?= \
        -Wno-field-redeclared
 
-QCCFLAGS_FEATURES ?= \
-       -DVEHICLES_ENABLED=1 \
-       -DVEHICLES_USE_ODE=0 \
-       -DBUILD_MOD=$(BUILD_MOD)
+QCCDEFS ?= \
+       -DWATERMARK="$(QCCFLAGS_WATERMARK)" \
+       -DNDEBUG=$(NDEBUG) \
+       -DBUILD_MOD=$(BUILD_MOD) \
+       $(QCCDEFS_EXTRA)
 
+# -Ooverlap-locals is required
 QCCFLAGS ?= \
        -std=gmqcc \
+       -Ooverlap-locals \
        -O3 \
-       -Werror -Wall -Wcpp \
+       -Werror -Wall \
        $(QCCFLAGS_WTFS) \
-       -fftepp -flno -futf8 -fno-bail-on-werror -fftepp-predefs \
+       -flno -futf8 -fno-bail-on-werror \
        -frelaxed-switch -freturn-assignments \
-       $(QCCFLAGS_WATERMARK) \
-       $(QCCFLAGS_FEATURES) \
        $(QCCFLAGS_EXTRA)
 
 # xonotic build system overrides this by command line argument to turn off the update-cvarcount step
@@ -37,26 +41,32 @@ qc: ../menu.dat ../progs.dat ../csprogs.dat
 .PHONY: clean
 clean:
        rm -f ../progs.dat ../menu.dat ../csprogs.dat
+       rm -f tmp/*.qc tmp/*.d tmp/*.txt
 
 $(QCCVERSIONFILE):
        $(RM) qccversion.*
        echo This file intentionally left blank. > $@
 
-FILES_CSPROGS = $(shell find client lib common warpzonelib csqcmodellib -type f -not -name fteqcc.log -not -name qc.asm)
-../csprogs.dat: $(FILES_CSPROGS) $(QCCVERSIONFILE)
+export QCC
+export CPP
+export QCCDEFS
+export QCCFLAGS
+
+../csprogs.dat: client/progs.inc $(QCCVERSIONFILE)
        @echo make[1]: Entering directory \`$(PWD)/client\'
-       cd client && $(QCC) $(QCCFLAGS) -DCSQC
+       sh ./qcc.sh client $@ $<
+-include tmp/client.d
 
-FILES_PROGS = $(shell find server lib common warpzonelib csqcmodellib -type f -not -name fteqcc.log -not -name qc.asm)
-../progs.dat: $(FILES_PROGS) $(QCCVERSIONFILE)
+../progs.dat: server/progs.inc $(QCCVERSIONFILE)
        @echo make[1]: Entering directory \`$(PWD)/server\'
-       cd server && $(QCC) $(QCCFLAGS) -DSVQC
+       sh ./qcc.sh server $@ $<
+-include tmp/server.d
 
-FILES_MENU = $(shell find menu lib common warpzonelib -type f -not -name fteqcc.log -not -name qc.asm)
-../menu.dat: $(FILES_MENU) $(QCCVERSIONFILE)
+../menu.dat: menu/progs.inc $(QCCVERSIONFILE)
        @echo make[1]: Entering directory \`$(PWD)/menu\'
-       cd menu && $(QCC) $(QCCFLAGS) -DMENUQC
+       sh ./qcc.sh menu $@ $<
+-include tmp/menu.d
 
 .PHONY: testcase
 testcase:
-       cd testcase && $(QCC) $(QCCFLAGS) -DTESTCASE="$$TESTCASE"
+       cd testcase && $(QCC) $(QCCDEFS) $(QCCFLAGS) -DTESTCASE="$$TESTCASE"