From: Mattia Basaglia <mattia.basaglia@gmail.com>
Date: Thu, 30 Jul 2015 14:46:49 +0000 (+0200)
Subject: Ensure ./all compile-map uses cmake to build q3map2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fheads%2FMelanosuchus%2Fnetradiant-cmake;p=xonotic%2Fxonotic.git

Ensure ./all compile-map uses cmake to build q3map2
---

diff --git a/misc/tools/all/xonotic.subr b/misc/tools/all/xonotic.subr
index 6f66d62e..778f9104 100644
--- a/misc/tools/all/xonotic.subr
+++ b/misc/tools/all/xonotic.subr
@@ -10,7 +10,14 @@ case "$cmd" in
 		fi
 		if ! [ -f "netradiant/install/q3map2" ] ; then
 			msg "q3map2 needed! Building netradiant..."
-			make -C netradiant BUILD=native install/q3map2
+			if ! [ -d "netradiant/install" ] ; then
+				mkdir "netradiant/install"
+			fi
+			(
+				cd "netradiant/install"
+				cmake -D CMAKE_BUILD_TYPE=Release ..
+				make q3map2
+			)
 		fi
 		for mapfile in "$@"; do
 			mapfile="data/xonotic-maps.pk3dir/maps/$mapfile.map"