From 5929d4780debbf21725fc1017cf6b4b17ae8a2e6 Mon Sep 17 00:00:00 2001 From: Nicky Date: Mon, 17 Jan 2022 16:54:33 +0100 Subject: [PATCH] Enable ninja build generator for all platforms --- scripts/configure_firestorm.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/configure_firestorm.sh b/scripts/configure_firestorm.sh index ed28c392c7..1b09dfbbfa 100755 --- a/scripts/configure_firestorm.sh +++ b/scripts/configure_firestorm.sh @@ -83,7 +83,7 @@ showUsage() echo " --testbuild : Create time-limited test build (build date + )" echo " --platform : Build for specified platform (darwin | windows | linux)" echo " --jobs : Build with jobs in parallel (Linux and Darwin only)" - echo " --ninja : Build using Ninja (Linux only)" + echo " --ninja : Build using Ninja" echo " --vscode : Exports compile commands for VSCode (Linux only)" echo echo "All arguments not in the above list will be passed through to LL's configure/build." @@ -525,11 +525,7 @@ if [ $WANTS_CONFIG -eq $TRUE ] ; then TARGET="Xcode" elif [ \( $TARGET_PLATFORM == "linux" \) ] ; then OPENAL="-DOPENAL:BOOL=ON" - if [ $WANTS_NINJA -eq $TRUE ] ; then - TARGET="Ninja" - else - TARGET="Unix Makefiles" - fi + TARGET="Unix Makefiles" if [ $WANTS_VSCODE -eq $TRUE ] ; then VSCODE_FLAGS="-DCMAKE_EXPORT_COMPILE_COMMANDS=On" ROOT_DIR=$(dirname $(dirname $(readlink -f $0))) @@ -545,6 +541,10 @@ if [ $WANTS_CONFIG -eq $TRUE ] ; then UNATTENDED="-DUNATTENDED=ON" fi + if [ $WANTS_NINJA -eq $TRUE ] ; then + TARGET="Ninja" + fi + cmake -G "$TARGET" ../indra $CHANNEL ${GITHASH} $FMODSTUDIO $OPENAL $KDU $OPENSIM $SINGLEGRID $AVX_OPTIMIZATION $AVX2_OPTIMIZATION $TRACY_PROFILER $TESTBUILD $PACKAGE \ $UNATTENDED -DLL_TESTS:BOOL=OFF -DADDRESS_SIZE:STRING=$AUTOBUILD_ADDRSIZE -DCMAKE_BUILD_TYPE:STRING=$BTYPE \ $CRASH_REPORTING -DVIEWER_SYMBOL_FILE:STRING="${VIEWER_SYMBOL_FILE:-}" -DROOT_PROJECT_NAME:STRING=Firestorm $LL_ARGS_PASSTHRU ${VSCODE_FLAGS:-} | tee $LOG