Apply SPAWNFUNC_CHECK_FIELDS in the Makefile for customization reasons

diff --git a/qcsrc/Makefile b/qcsrc/Makefile
index ee9e7e64ab9c6e6016fd362b3e2faca5a801b369..f0ebdf881e03fa79d1945162db98c13274692e80 100644 (file)
--- a/qcsrc/Makefile
+++ b/qcsrc/Makefile
@@ -11,6 +11,7 @@ XONOTIC ?= 1
 ENABLE_EFFECTINFO ?= 0
 ENABLE_DEBUGDRAW ?= 0
 ENABLE_DEBUGTRACE ?= 0
+SPAWNFUNC_CHECK_FIELDS ?= 1
 BUILD_MOD ?=
 
 ifndef ZIP
@@ -44,6 +45,7 @@ QCCDEFS ?= \
        -DENABLE_EFFECTINFO=$(ENABLE_EFFECTINFO) \
        -DENABLE_DEBUGDRAW=$(ENABLE_DEBUGDRAW) \
        -DENABLE_DEBUGTRACE=$(ENABLE_DEBUGTRACE) \
+       -DSPAWNFUNC_CHECK_FIELDS=$(SPAWNFUNC_CHECK_FIELDS) \
        $(if $(BUILD_MOD), -DBUILD_MOD="$(BUILD_MOD)" -I$(BUILD_MOD), ) \
        $(QCCDEFS_EXTRA)
 

diff --git a/qcsrc/lib/spawnfunc.qh b/qcsrc/lib/spawnfunc.qh
index b63deac97a0a039e056b46a0cb052d434f7664af..8e226b39138d631a54043d001f11ce8b13a0af02 100644 (file)
--- a/qcsrc/lib/spawnfunc.qh
+++ b/qcsrc/lib/spawnfunc.qh
@@ -89,7 +89,6 @@ noref string __fullspawndata;
 
 // enables/disables warnings if a map entity has a field that doesn't exist
 // useful for debugging and compatibility testing
-#define SPAWNFUNC_CHECK_FIELDS 1
 #if SPAWNFUNC_CHECK_FIELDS
 
        #define FIELD_SCALAR(fld, n) \

diff --git a/qcsrc/tools/compilationunits.sh b/qcsrc/tools/compilationunits.sh
index d13cb6e091e8f2dd9e350f78e25fc30f7de33d35..fa08cdcaad43f577ec3321fc9d7765357ce7d921 100755 (executable)
--- a/qcsrc/tools/compilationunits.sh
+++ b/qcsrc/tools/compilationunits.sh
@@ -34,6 +34,7 @@ declare -a QCCDEFS=(
     -DENABLE_EFFECTINFO=0
     -DENABLE_DEBUGDRAW=0
     -DENABLE_DEBUGTRACE=0
+    -DSPAWNFUNC_CHECK_FIELDS=1
 )
 QCCDEFS="${QCCDEFS[@]}"