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 9bc4cd6ea1714c21791078860865dd12d215ed02..0938974ca9b46bcfa8fd36442cf7de74267d49b7 100644 (file)
--- 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 5903569d5ad7270bd37cef5b3ca4c365bfd0f3db..90815e863c61e989d931eb99d7f87dfac9414711 100755 (executable)
--- 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';