X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2FMakefile;h=d09b2c5ccffa730255a6545d0f411a11adc05fc5;hp=ac418a5fae9a7df4290b8a5823e24b5394186bd7;hb=af43b181a15f348a4de2045b716ebc7765ce8f9f;hpb=6ba37d06b4afe2b08882f5cc5b211441227586b2

diff --git a/qcsrc/Makefile b/qcsrc/Makefile
index ac418a5fae..d09b2c5ccf 100644
--- a/qcsrc/Makefile
+++ b/qcsrc/Makefile
@@ -1,21 +1,50 @@
-SCM := $(shell if [ -d .svn ]; then echo svn; elif [ -d ../.git ]; then echo git; fi)
-PERL ?= perl
-QCCFLAGS_WATERMARK ?= -DWATERMARK='"$(shell git describe)"'
+CPP := cc -xc -E
 QCC ?= gmqcc
-QCCDEFS_EXTRA ?= -DGMQCC
+
+PROGS_OUT ?= ..
+WORKDIR ?= ../.tmp
+
+QCCFLAGS_WATERMARK ?= $(shell git describe --tags --dirty='~')
+VER = $(subst *,\*,$(QCCFLAGS_WATERMARK))
 NDEBUG ?= 1
-BUILD_MOD ?= 0
+XONOTIC ?= 1
+ENABLE_EFFECTINFO ?= 0
+ENABLE_DEBUGDRAW ?= 0
+ENABLE_DEBUGTRACE ?= 0
+BUILD_MOD ?=
+
+ifndef ZIP
+	ifneq ($(shell which zip 2>/dev/null),)
+		ZIP := zip -9
+	endif
+	ifneq ($(shell which 7z 2>/dev/null),)
+		ZIP := 7z a -tzip -mx=9
+	endif
+	ifneq ($(shell which 7za 2>/dev/null),)
+		ZIP := 7za a -tzip -mx=9
+	endif
+    ifndef ZIP
+        $(warning "No zip / 7z / 7za in ($(PATH))")
+        ZIP := : zip_not_found
+    endif
+endif
 
-QCCVERSIONFILE := qccversion.$(shell (cd server && $(QCC) --version) > qccversion.txt && git hash-object qccversion.txt)
+# Set to empty string to temporarily enable warnings when debugging
+QCCFLAGS_WERROR ?= \
+	-Werror
 
 # We eventually need to get rid of these
 QCCFLAGS_WTFS ?= \
 	-Wno-field-redeclared
 
 QCCDEFS ?= \
-	$(QCCFLAGS_WATERMARK) \
+	-DXONOTIC=$(XONOTIC) \
+	-DWATERMARK="$(QCCFLAGS_WATERMARK)" \
 	-DNDEBUG=$(NDEBUG) \
-	-DBUILD_MOD=$(BUILD_MOD) \
+	-DENABLE_EFFECTINFO=$(ENABLE_EFFECTINFO) \
+	-DENABLE_DEBUGDRAW=$(ENABLE_DEBUGDRAW) \
+	-DENABLE_DEBUGTRACE=$(ENABLE_DEBUGTRACE) \
+	$(if $(BUILD_MOD), -DBUILD_MOD="$(BUILD_MOD)" -I$(BUILD_MOD), ) \
 	$(QCCDEFS_EXTRA)
 
 # -Ooverlap-locals is required
@@ -23,54 +52,76 @@ QCCFLAGS ?= \
 	-std=gmqcc \
 	-Ooverlap-locals \
 	-O3 \
-	-Werror -Wall \
+	$(QCCFLAGS_WERROR) \
+	-Wall \
 	$(QCCFLAGS_WTFS) \
 	-flno -futf8 -fno-bail-on-werror \
 	-frelaxed-switch -freturn-assignments \
 	$(QCCFLAGS_EXTRA)
 
-# xonotic build system overrides this by command line argument to turn off the update-cvarcount step
-XON_BUILDSYSTEM =
+
 
 .PHONY: all
-all: qc
+all: qc pk3
 
-.PHONY: qc
-qc: ../menu.dat ../progs.dat ../csprogs.dat
+$(WORKDIR):
+	@mkdir -p $@
 
 .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. > $@
-
-../csprogs.dat: client/progs.inc $(QCCVERSIONFILE)
-	$(CC) -xc -I. $(QCCDEFS) -DCSQC -E -MMD -MP -MT $@ -Wall -Wundef -Werror -CC -o tmp/client.qc $<
-	@$(CC) -xc -I. $(QCCDEFS) -DCSQC -E -dM 1>tmp/client_macros.txt -H 2>tmp/client_includes.txt $<
-	@sed -i 's/^# \([[:digit:]]\+\) "\(.*\)".*/\n#pragma file(\2)\n#pragma line(\1)/g' tmp/client.qc
-	@echo make[1]: Entering directory \`$(PWD)/client\'
-	cd client && $(QCC) $(QCCFLAGS) -o ../$@ ../tmp/client.qc
--include tmp/client.d
-
-../progs.dat: server/progs.inc $(QCCVERSIONFILE)
-	$(CC) -xc -I. $(QCCDEFS) -DSVQC -E -MMD -MP -MT $@ -Wall -Wundef -Werror -CC -o tmp/server.qc $<
-	@$(CC) -xc -I. $(QCCDEFS) -DSVQC -E -dM 1>tmp/server_macros.txt -H 2>tmp/server_includes.txt $<
-	@sed -i 's/^# \([[:digit:]]\+\) "\(.*\)".*/\n#pragma file(\2)\n#pragma line(\1)/g' tmp/server.qc
-	@echo make[1]: Entering directory \`$(PWD)/server\'
-	cd server && $(QCC) $(QCCFLAGS) -o ../$@ ../tmp/server.qc
--include tmp/server.d
-
-../menu.dat: menu/progs.inc $(QCCVERSIONFILE)
-	$(CC) -xc -I. $(QCCDEFS) -DMENUQC -E -MMD -MP -MT $@ -Wall -Wundef -Werror -CC -o tmp/menu.qc $<
-	@$(CC) -xc -I. $(QCCDEFS) -DMENUQC -E -dM 1>tmp/menu_macros.txt -H 2>tmp/menu_includes.txt $<
-	@sed -i 's/^# \([[:digit:]]\+\) "\(.*\)".*/\n#pragma file(\2)\n#pragma line(\1)/g' tmp/menu.qc
-	@echo make[1]: Entering directory \`$(PWD)/menu\'
-	cd menu && $(QCC) $(QCCFLAGS) -o ../$@ ../tmp/menu.qc
--include tmp/menu.d
-
-.PHONY: testcase
-testcase:
-	cd testcase && $(QCC) $(QCCDEFS) $(QCCFLAGS) -DTESTCASE="$$TESTCASE"
+clean: | $(WORKDIR)
+	$(RM) $(PROGS_OUT)/csprogs.dat
+	$(RM) $(PROGS_OUT)/menu.dat
+	$(RM) $(PROGS_OUT)/progs.dat
+	$(RM) $(WORKDIR)/*.d
+	$(RM) $(WORKDIR)/*.qc
+	$(RM) $(WORKDIR)/*.txt
+
+.PHONY: qc
+qc: $(PROGS_OUT)/csprogs.dat $(PROGS_OUT)/menu.dat $(PROGS_OUT)/progs.dat
+
+.PHONY: pk3
+pk3: csprogs-$(VER).pk3
+
+
+
+
+
+%-$(VER).pk3: $(PROGS_OUT)/%.dat
+	$(eval PROG=$*)
+	$(eval PK3=$(PROG)-$(VER).pk3)
+	$(eval TXT=$(PROG)-$(VER).txt)
+	$(eval DAT=$(PROG)-$(VER).dat)
+	$(eval LNO=$(PROG)-$(VER).lno)
+	@ echo "http://xonotic.org" > $(TXT)
+	@ ln -f $(PROGS_OUT)/$(PROG).dat $(DAT)
+	@ ln -f $(PROGS_OUT)/$(PROG).lno $(LNO)
+	@ $(RM) *.pk3
+	$(ZIP) $(PK3) $(TXT) $(DAT) $(LNO)
+	@ $(RM) $(TXT) $(DAT) $(LNO)
+
+QCCVERSION := $(shell cd lib && $(QCC) --version)
+QCCVERSIONFILE := $(WORKDIR)/qccversion.$(shell echo ${QCCVERSION} | git hash-object --stdin)
+$(QCCVERSIONFILE): | $(WORKDIR)
+	@ $(RM) $(WORKDIR)/qccversion.*
+	@ echo $(QCCVERSION) > $@
+
+export WORKDIR
+export CPP
+export QCC
+export QCCDEFS
+export QCCFLAGS
+
+$(PROGS_OUT)/csprogs.dat: client/progs.inc $(QCCVERSIONFILE) | $(WORKDIR)
+	@ echo make[1]: Entering directory \`$(CURDIR)/client\'
+	./tools/qcc.sh client $@ $<
+-include $(WORKDIR)/client.d
+
+$(PROGS_OUT)/progs.dat: server/progs.inc $(QCCVERSIONFILE) | $(WORKDIR)
+	@ echo make[1]: Entering directory \`$(CURDIR)/server\'
+	./tools/qcc.sh server $@ $<
+-include $(WORKDIR)/server.d
+
+$(PROGS_OUT)/menu.dat: menu/progs.inc $(QCCVERSIONFILE) | $(WORKDIR)
+	@ echo make[1]: Entering directory \`$(CURDIR)/menu\'
+	./tools/qcc.sh menu $@ $<
+-include $(WORKDIR)/menu.d