From 33aa8d8b574de1dbd848e2051fc7552e2e9a53b3 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Fri, 11 Oct 2019 18:38:08 +0200 Subject: [PATCH] Make xonotic-map-compiler use cmake. --- misc/infrastructure/xonotic-map-compiler.cron | 6 +++--- misc/tools/xonotic-map-compiler | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/misc/infrastructure/xonotic-map-compiler.cron b/misc/infrastructure/xonotic-map-compiler.cron index 6434f964..e9b69d87 100755 --- 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 -./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 diff --git a/misc/tools/xonotic-map-compiler b/misc/tools/xonotic-map-compiler index f21daaf8..5903569d 100755 --- 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. - 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*'; -- 2.39.2