X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2FMakefile;h=45360c60c19ff9ae2799e8aecb0c8ee20ada8b36;hb=9812a5883c82ff33cf4b889bdf6a094224c0d660;hp=452dfc9a6451ad219bfcfd3b84c9a06b924c504f;hpb=21307f327df5609b82d90496c1c6156d636d1c8d;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/Makefile b/qcsrc/Makefile
index 452dfc9a6..45360c60c 100644
--- a/qcsrc/Makefile
+++ b/qcsrc/Makefile
@@ -1,28 +1,33 @@
 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
+PROGS_OUT ?= $(CURDIR)/..
+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
@@ -32,31 +37,37 @@ XON_BUILDSYSTEM =
 all: qc
 
 .PHONY: qc
-qc: ../menu.dat ../progs.dat ../csprogs.dat
+qc: $(PROGS_OUT)/menu.dat $(PROGS_OUT)/progs.dat $(PROGS_OUT)/csprogs.dat
 
 .PHONY: clean
 clean:
-	rm -f ../progs.dat ../menu.dat ../csprogs.dat
+	rm -f $(PROGS_OUT)/{csprogs,progs,menu}.dat
+	rm -f ../.tmp/*.{qc,d,txt}
 
 $(QCCVERSIONFILE):
 	$(RM) qccversion.*
 	echo This file intentionally left blank. > $@
 
-FILES_CSPROGS = $(shell find lib common client -type f)
-../csprogs.dat: $(FILES_CSPROGS) $(QCCVERSIONFILE)
+export QCC
+export CPP
+export QCCDEFS
+export QCCFLAGS
+
+$(PROGS_OUT)/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 lib common server -type f)
-../progs.dat: $(FILES_PROGS) $(QCCVERSIONFILE)
+$(PROGS_OUT)/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 lib common menu -type f)
-../menu.dat: $(FILES_MENU) $(QCCVERSIONFILE)
+$(PROGS_OUT)/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"