X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2FMakefile;h=bfea08b5f92df070fbcc59269b5ec65ed7bb3162;hp=ee335d9b0013817edf041d88082c9d8a8a9d2cea;hb=2c2a008a2c1b25d47a81f5d7836a510d4643273a;hpb=3bdee6303ce762a39c2ad67a70745668ba298043

diff --git a/qcsrc/Makefile b/qcsrc/Makefile
index ee335d9b0..bfea08b5f 100644
--- a/qcsrc/Makefile
+++ b/qcsrc/Makefile
@@ -1,26 +1,30 @@
 CPP := cc -xc -E
 QCC ?= gmqcc
 
-PROGS_OUT ?= $(CURDIR)/..
+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),)
+	ifneq ($(shell which zip 2>/dev/null),)
 		ZIP := zip -9
 	endif
-	ifneq ($(shell which 7z),)
+	ifneq ($(shell which 7z 2>/dev/null),)
 		ZIP := 7z a -tzip -mx=9
 	endif
-	ifneq ($(shell which 7za),)
+	ifneq ($(shell which 7za 2>/dev/null),)
 		ZIP := 7za a -tzip -mx=9
 	endif
     ifndef ZIP
-        $(warning "No zip in ($(PATH))")
+        $(warning "No zip / 7z / 7za in ($(PATH))")
         ZIP := : zip_not_found
     endif
 endif
@@ -30,9 +34,13 @@ QCCFLAGS_WTFS ?= \
 	-Wno-field-redeclared
 
 QCCDEFS ?= \
+	-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
@@ -100,15 +108,15 @@ export QCCFLAGS
 
 $(PROGS_OUT)/csprogs.dat: client/progs.inc $(QCCVERSIONFILE) | $(WORKDIR)
 	@ echo make[1]: Entering directory \`$(CURDIR)/client\'
-	@ ./tools/qcc.sh 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 $@ $<
+	./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 $@ $<
+	./tools/qcc.sh menu $@ $<
 -include $(WORKDIR)/menu.d