Merge branch 'cmake-q3map2' into 'master'
authorRudolf Polzer <divverent@gmail.com>
Fri, 11 Oct 2019 16:43:37 +0000 (16:43 +0000)
committerRudolf Polzer <divverent@gmail.com>
Fri, 11 Oct 2019 16:43:37 +0000 (16:43 +0000)
all: compile q3map2 using cmake

See merge request xonotic/xonotic!45

misc/tools/all/xonotic.subr
misc/tools/xonotic-map-compiler

index 9bc4cd6..0938974 100644 (file)
@@ -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"
index 5903569..90815e8 100755 (executable)
@@ -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';