X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=misc%2Ftools%2Fall%2Fxonotic.subr;h=0938974ca9b46bcfa8fd36442cf7de74267d49b7;hp=9bc4cd6ea1714c21791078860865dd12d215ed02;hb=b21867380b07a080c13c6bc29eb8fffe40b51df1;hpb=b1001612ef9a239f227c426e54cbc8b38b80fb73 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"