From: Rudolf Polzer <divverent@gmail.com>
Date: Fri, 11 Oct 2019 16:43:37 +0000 (+0000)
Subject: Merge branch 'cmake-q3map2' into 'master'
X-Git-Tag: xonotic-v0.8.5~112
X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=b21867380b07a080c13c6bc29eb8fffe40b51df1;hp=d1c47472104b038ef3e73f300552def2bf49b6c6

Merge branch 'cmake-q3map2' into 'master'

all: compile q3map2 using cmake

See merge request xonotic/xonotic!45
---

diff --git a/misc/tools/all/xonotic.subr b/misc/tools/all/xonotic.subr
index 9bc4cd6e..0938974c 100644
--- a/misc/tools/all/xonotic.subr
+++ b/misc/tools/all/xonotic.subr
@@ -8,9 +8,10 @@ case "$cmd" in
 			msg "Usage: ./all compile-map mapname1 mapname2 mapname3"
 			msg "For example: ./all compile-map dance xoylent"
 		fi
-		if ! [ -f "netradiant/install/q3map2" ] ; then
-			msg "q3map2 needed! Building netradiant..."
-			make -C netradiant BUILD=native install/q3map2
+		if ! [ -f "netradiant/build/q3map2" ] ; then
+			msg "q3map2 needed! Building q3map2..."
+			cmake -H'netradiant' -B'netradiant/build' -G'Unix Makefiles' -D'CMAKE_BUILD_TYPE=Release' -DBUILD_RADIANT=OFF -DDOWNLOAD_GAMEPACKS=OFF
+			cmake --build 'netradiant/build' -- q3map2
 		fi
 		for mapfile in "$@"; do
 			mapfile="data/xonotic-maps.pk3dir/maps/$mapfile.map"
diff --git a/misc/tools/xonotic-map-compiler b/misc/tools/xonotic-map-compiler
index 5903569d..90815e86 100755
--- a/misc/tools/xonotic-map-compiler
+++ b/misc/tools/xonotic-map-compiler
@@ -11,7 +11,7 @@ use File::Temp;
 	# Path to Xonotic (where the data directory is in)
 	our $XONOTICDIR  = getcwd();
 
-	# Path to your q3map2 program. You find it in your GtkRadiant/install
+	# Path to your q3map2 program. You find it in your netradiant/build
 	# directory.
 	our $Q3MAP2      = getcwd() . '/netradiant/build/q3map2';