Remove unused definitions

[xonotic/xonotic-data.pk3dir.git] / qcsrc / Makefile

diff --git a/qcsrc/Makefile b/qcsrc/Makefile
index 452dfc9a6451ad219bfcfd3b84c9a06b924c504f..fd566d714ad41572832e3eac44edc0e90dc2c266 100644 (file)
--- a/qcsrc/Makefile
+++ b/qcsrc/Makefile
@@ -2,26 +2,28 @@ SCM := $(shell if [ -d .svn ]; then echo svn; elif [ -d ../.git ]; then echo git
 PERL ?= perl
 QCCFLAGS_WATERMARK ?= -DWATERMARK='"$(shell git describe)"'
 QCC ?= gmqcc
+NDEBUG ?= 1
  
 QCCVERSIONFILE := qccversion.$(shell (cd server && $(QCC) --version) > qccversion.txt && git hash-object qccversion.txt)
 
-# We eventually need to get rid of these.
+# We eventually need to get rid of these
 QCCFLAGS_WTFS ?= \
        -Wno-field-redeclared
 
 QCCFLAGS_FEATURES ?= \
-       -DVEHICLES_ENABLED=1 \
-       -DVEHICLES_USE_ODE=0 \
        -DBUILD_MOD=$(BUILD_MOD)
 
+# -Ooverlap-locals is required
 QCCFLAGS ?= \
        -std=gmqcc \
+       -Ooverlap-locals \
        -O3 \
        -Werror -Wall -Wcpp \
        $(QCCFLAGS_WTFS) \
        -fftepp -flno -futf8 -fno-bail-on-werror -fftepp-predefs \
        -frelaxed-switch -freturn-assignments \
        $(QCCFLAGS_WATERMARK) \
+       -DNDEBUG=$(NDEBUG) \
        $(QCCFLAGS_FEATURES) \
        $(QCCFLAGS_EXTRA)
 
@@ -45,17 +47,17 @@ $(QCCVERSIONFILE):
 FILES_CSPROGS = $(shell find lib common client -type f)
 ../csprogs.dat: $(FILES_CSPROGS) $(QCCVERSIONFILE)
        @echo make[1]: Entering directory \`$(PWD)/client\'
-       cd client && $(QCC) $(QCCFLAGS) -DCSQC
+       cd client && $(QCC) $(QCCFLAGS) -DCSQC -o ../../csprogs.dat progs.inc
 
 FILES_PROGS = $(shell find lib common server -type f)
 ../progs.dat: $(FILES_PROGS) $(QCCVERSIONFILE)
        @echo make[1]: Entering directory \`$(PWD)/server\'
-       cd server && $(QCC) $(QCCFLAGS) -DSVQC
+       cd server && $(QCC) $(QCCFLAGS) -DSVQC -o ../../progs.dat progs.inc
 
 FILES_MENU = $(shell find lib common menu -type f)
 ../menu.dat: $(FILES_MENU) $(QCCVERSIONFILE)
        @echo make[1]: Entering directory \`$(PWD)/menu\'
-       cd menu && $(QCC) $(QCCFLAGS) -DMENUQC
+       cd menu && $(QCC) $(QCCFLAGS) -DMENUQC -o ../../menu.dat progs.inc
 
 .PHONY: testcase
 testcase: