]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
Ensure ./all compile-map uses cmake to build q3map2 Melanosuchus/netradiant-cmake
authorMattia Basaglia <mattia.basaglia@gmail.com>
Thu, 30 Jul 2015 14:46:49 +0000 (16:46 +0200)
committerMattia Basaglia <mattia.basaglia@gmail.com>
Thu, 30 Jul 2015 14:46:49 +0000 (16:46 +0200)
misc/tools/all/xonotic.subr

index 6f66d62e76048a755f8ca3afe7e8e4ac1e08311f..778f91041ddc06bb1be7f47bba6ee4ac3cd2edce 100644 (file)
@@ -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"