X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2FMakefile;h=bfea08b5f92df070fbcc59269b5ec65ed7bb3162;hb=678127044857fb9b89f06faf7a3313bdeb43205c;hp=c660a7e94e5269d40aeea9f433fc2de70ee00bca;hpb=35eff34d3dd4296ca9a9ab553f6d71e76dd9581f;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/Makefile b/qcsrc/Makefile
index c660a7e94..bfea08b5f 100644
--- a/qcsrc/Makefile
+++ b/qcsrc/Makefile
@@ -8,20 +8,23 @@ QCCFLAGS_WATERMARK ?= $(shell git describe --tags --dirty='~')
 VER = $(subst *,\*,$(QCCFLAGS_WATERMARK))
 NDEBUG ?= 1
 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
@@ -34,6 +37,9 @@ QCCDEFS ?= \
 	-DXONOTIC=$(XONOTIC) \
 	-DWATERMARK="$(QCCFLAGS_WATERMARK)" \
 	-DNDEBUG=$(NDEBUG) \
+	-DENABLE_EFFECTINFO=$(ENABLE_EFFECTINFO) \
+	-DENABLE_DEBUGDRAW=$(ENABLE_DEBUGDRAW) \
+	-DENABLE_DEBUGTRACE=$(ENABLE_DEBUGTRACE) \
 	$(if $(BUILD_MOD), -DBUILD_MOD="$(BUILD_MOD)" -I$(BUILD_MOD), ) \
 	$(QCCDEFS_EXTRA)