From: Rudolf Polzer Date: Mon, 8 Jul 2013 08:00:14 +0000 (+0200) Subject: fix make clean X-Git-Tag: xonotic-v0.8.0~381 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=46014ce5c3549fda3358f4f90319959bea1811f9;p=xonotic%2Fxonotic-data.pk3dir.git fix make clean --- diff --git a/qcsrc/Makefile b/qcsrc/Makefile index 3708ab483..f5c4066be 100644 --- a/qcsrc/Makefile +++ b/qcsrc/Makefile @@ -49,7 +49,7 @@ qc-recursive: ../menu.dat ../progs.dat ../csprogs.dat .PHONY: clean clean: - rm -f ../progs.dat ../menu.dat ../csprogs.dat + rm -f ../progs.dat ../menu.dat ../csprogs.dat server/precache-for-csqc.inc $(QCCVERSIONFILE): $(RM) qccversion.* @@ -60,11 +60,11 @@ FILES_CSPROGS = $(shell find client common warpzonelib csqcmodellib -type f -not @echo make[1]: Entering directory \`$(PWD)/client\' cd client && $(QCC) $(QCCFLAGS) -server/precache-for-csqc.qc: $(FILES_CSPROGS) +server/precache-for-csqc.inc: $(FILES_CSPROGS) sh collect-precache.sh FILES_PROGS = $(shell find server common warpzonelib csqcmodellib -type f -not -name fteqcc.log -not -name qc.asm) $(wildcard server/w_*.qc) -../progs.dat: $(FILES_PROGS) $(QCCVERSIONFILE) server/precache-for-csqc.qc +../progs.dat: $(FILES_PROGS) $(QCCVERSIONFILE) server/precache-for-csqc.inc @echo make[1]: Entering directory \`$(PWD)/server\' cd server && $(QCC) $(QCCFLAGS) diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc index 190870d7b..df0903213 100644 --- a/qcsrc/server/miscfunctions.qc +++ b/qcsrc/server/miscfunctions.qc @@ -1417,7 +1417,7 @@ void precache() } #endif - PrecacheForCSQC(); +#include "precache-for-csqc.inc" } // WARNING: this kills the trace globals diff --git a/qcsrc/server/progs.src b/qcsrc/server/progs.src index aa0944499..367e8609d 100644 --- a/qcsrc/server/progs.src +++ b/qcsrc/server/progs.src @@ -100,7 +100,6 @@ secret.qh scores_rules.qc -precache-for-csqc.qc miscfunctions.qc waypointsprites.qc