From: TimePath <andrew.hardaker1995@gmail.com>
Date: Wed, 23 Dec 2015 05:57:00 +0000 (+1100)
Subject: Remove unused definitions
X-Git-Tag: xonotic-v0.8.2~1459
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c644bdd821dcc3ac2c5244be487ec16c5088779f;p=xonotic%2Fxonotic-data.pk3dir.git

Remove unused definitions
---

diff --git a/qcsrc/Makefile b/qcsrc/Makefile
index bea2993a0..fd566d714 100644
--- a/qcsrc/Makefile
+++ b/qcsrc/Makefile
@@ -6,17 +6,14 @@ 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 \
diff --git a/qcsrc/common/vehicles/sv_vehicles.qh b/qcsrc/common/vehicles/sv_vehicles.qh
index 496ef9c40..aee4bf6c6 100644
--- a/qcsrc/common/vehicles/sv_vehicles.qh
+++ b/qcsrc/common/vehicles/sv_vehicles.qh
@@ -4,8 +4,6 @@
 
 #include "../turrets/sv_turrets.qh"
 
-// #define VEHICLES_USE_ODE
-
 // vehicle cvars
 float autocvar_g_vehicles;
 float autocvar_g_vehicles_enter;
diff --git a/qcsrc/test/compilationunit.sh b/qcsrc/test/compilationunit.sh
index 66cf5c576..dfe7181ae 100755
--- a/qcsrc/test/compilationunit.sh
+++ b/qcsrc/test/compilationunit.sh
@@ -8,10 +8,6 @@ declare -a NOWARN=(
   -Wno-unused-variable
   -Wno-implicit-function-pointer
 )
-declare -a FEATURES=(
-  -DVEHICLES_ENABLED=1
-  -DVEHICLES_USE_ODE=0
-)
 declare QCC=../../../gmqcc/gmqcc
 
 declare -a QCC_FLAGS=(
@@ -21,7 +17,7 @@ declare -a QCC_FLAGS=(
   -futf8
   -freturn-assignments
   -frelaxed-switch
-  -O3
+  -Ooverlap-locals
 )
 
 function check() {
@@ -29,7 +25,7 @@ function check() {
   declare -la predefs=("-D${2}" "lib/_all.inc" "${base}/_all.qh")
   find "$base" -type f -name '*.qc' -print0 | sort -z | while read -r -d '' file; do
     echo "$file"
-    ${QCC} "${QCC_FLAGS[@]}" "${NOWARN[@]}" "${FEATURES[@]}" "${predefs[@]}" "$file" >/dev/null
+    ${QCC} "${QCC_FLAGS[@]}" "${NOWARN[@]}" "${predefs[@]}" "$file" >/dev/null
   done
 }