Define XONOTIC=1

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c2b8564351a1b9ce23b56fa0b69a7135d2df527a..fdbce7d5ac19f8b20fd5990f9756af7773ea05ba 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,6 +4,7 @@ project(xonotic-data LANGUAGES ASM)
 
 include_directories(qcsrc)
 
+add_definitions(-DXONOTIC=1)
 add_definitions(-DNDEBUG=1)
 
 find_package(Git REQUIRED)

diff --git a/qcsrc/Makefile b/qcsrc/Makefile
index ee335d9b0013817edf041d88082c9d8a8a9d2cea..0ed67281b4259d18fdd466d6f29912b94f011a63 100644 (file)
--- a/qcsrc/Makefile
+++ b/qcsrc/Makefile
@@ -7,6 +7,7 @@ WORKDIR ?= ../.tmp
 QCCFLAGS_WATERMARK ?= $(shell git describe --tags --dirty='~')
 VER = $(subst *,\*,$(QCCFLAGS_WATERMARK))
 NDEBUG ?= 1
+XONOTIC ?= 1
 BUILD_MOD ?= 0
 
 ifndef ZIP
@@ -30,6 +31,7 @@ QCCFLAGS_WTFS ?= \
        -Wno-field-redeclared
 
 QCCDEFS ?= \
+       -DXONOTIC=$(XONOTIC) \
        -DWATERMARK="$(QCCFLAGS_WATERMARK)" \
        -DNDEBUG=$(NDEBUG) \
        -DBUILD_MOD=$(BUILD_MOD) \

diff --git a/qcsrc/client/progs.inc b/qcsrc/client/progs.inc
index a736d32622cb6b8f470f2334e7bea06c504eb1a0..8952f058f40299a6dde8812d2282900c00b38e32 100644 (file)
--- a/qcsrc/client/progs.inc
+++ b/qcsrc/client/progs.inc
@@ -1,4 +1,7 @@
 #include <lib/_all.inc>
+
+#if XONOTIC
+
 #include "_all.qh"
 
 #include "../client/_mod.inc"
@@ -20,6 +23,8 @@
 #include <lib/warpzone/server.qc>
 #include <lib/warpzone/util_server.qc>
 
+#endif
+
 #if BUILD_MOD
 #include "../../mod/client/progs.inc"
 #endif

diff --git a/qcsrc/menu/progs.inc b/qcsrc/menu/progs.inc
index 9b15d8caa6345efb2792e3d336e4d037489a3bfd..ad08af93dd5581bb5076865763737d9c20ca2ec4 100644 (file)
--- a/qcsrc/menu/progs.inc
+++ b/qcsrc/menu/progs.inc
@@ -1,5 +1,7 @@
 #include <lib/_all.inc>
 
+#if XONOTIC
+
 #include "../menu/_mod.inc"
 #include "anim/_mod.inc"
 #include "command/_mod.inc"
@@ -9,6 +11,8 @@
 
 #include <common/_all.inc>
 
+#endif
+
 #if BUILD_MOD
 #include "../../mod/menu/progs.inc"
 #endif

diff --git a/qcsrc/server/progs.inc b/qcsrc/server/progs.inc
index 0396dee6cd249862d3bbfad5329cf7bff204280b..ed005dfad6e037f827bfc54a7e935e37635e3143 100644 (file)
--- a/qcsrc/server/progs.inc
+++ b/qcsrc/server/progs.inc
@@ -3,6 +3,9 @@
 #endif
 
 #include <lib/_all.inc>
+
+#if XONOTIC
+
 #include "_all.qh"
 
 #include "../server/_mod.inc"
@@ -23,6 +26,8 @@
 #include <lib/warpzone/server.qc>
 #include <lib/warpzone/util_server.qc>
 
+#endif
+
 #if BUILD_MOD
 #include "../../mod/server/progs.inc"
 #endif

diff --git a/qcsrc/tools/compilationunits.sh b/qcsrc/tools/compilationunits.sh
index 3c794e93fbba747b9eb43b6954a86a3c4a0856cf..0a03de360292dfb4eef7b84ece96d524466207f4 100755 (executable)
--- a/qcsrc/tools/compilationunits.sh
+++ b/qcsrc/tools/compilationunits.sh
@@ -9,6 +9,7 @@ CPP="cc -xc -E"
 
 declare -a QCCDEFS=(
     -DNDEBUG=1
+    -DXONOTIC=1
     -DWATERMARK="\"$(git describe --tags --dirty='~')\""
     -DDEBUGPATHING=0
 )