Make xonotic-map-compiler use cmake.

diff --git a/misc/infrastructure/xonotic-map-compiler.cron b/misc/infrastructure/xonotic-map-compiler.cron
index 6434f9649c23bdc895bf0c4297429bbef243f36c..e9b69d871672950f60dc2ad5387fa94c35dc72f6 100755 (executable)
--- a/misc/infrastructure/xonotic-map-compiler.cron
+++ b/misc/infrastructure/xonotic-map-compiler.cron
@@ -11,7 +11,7 @@ trap 'exit 1' INT TERM
 
 set -e
 cd xonotic-map-compiler
 
 set -e
 cd xonotic-map-compiler

-./all clean -m -fU -D
-# like reclone but do not delete untracked, so q3map2.x86 compile stays
-make -C netradiant install/q3map2.x86
+./all clean -m -fU -D # like reclone but do not delete untracked, so q3map2.x86 compile stays
+cmake -G "Unix Makefiles" -H. -Bbuild -DCMAKE_BUILD_TYPE=Release
+cmake --build build -- q3map2

 ./misc/tools/xonotic-map-compiler-autobuild build
 ./misc/tools/xonotic-map-compiler-autobuild build

diff --git a/misc/tools/xonotic-map-compiler b/misc/tools/xonotic-map-compiler
index f21daaf8dd6d9a6f591d757a6341fa4fb149492a..5903569d5ad7270bd37cef5b3ca4c365bfd0f3db 100755 (executable)
--- a/misc/tools/xonotic-map-compiler
+++ b/misc/tools/xonotic-map-compiler
@@ -13,7 +13,7 @@ use File::Temp;
 
        # Path to your q3map2 program. You find it in your GtkRadiant/install
        # directory.
 
        # Path to your q3map2 program. You find it in your GtkRadiant/install
        # directory.

-       our $Q3MAP2      = getcwd() . '/netradiant/install/q3map2';
+       our $Q3MAP2      = getcwd() . '/netradiant/build/q3map2';

 
        # General flags for q3map2 (for example -threads 4)
        our $Q3MAP2FLAGS = '-fs_forbiddenpath xonotic*-data*.pk3* -fs_forbiddenpath xonotic*-nexcompat*.pk3*';
 
        # General flags for q3map2 (for example -threads 4)
        our $Q3MAP2FLAGS = '-fs_forbiddenpath xonotic*-data*.pk3* -fs_forbiddenpath xonotic*-nexcompat*.pk3*';