Author: hbelusca Date: Fri May 31 21:04:28 2013 New Revision: 59129 URL: http://svn.reactos.org/svn/reactos?rev=59129&view=rev Log: Finally,... ... use Ninja by default for compiling ReactOS !!
Users now have to do: ./configure to use Ninja for building ReactOS. The old method (using makefiles) is available by doing: ./configure Makefiles (or: ./configure makefiles ) Tested by Amine and Sylvain (blame them ;) ) Modified: trunk/reactos/configure.cmd trunk/reactos/configure.sh Modified: trunk/reactos/configure.cmd URL: http://svn.reactos.org/svn/reactos/trunk/reactos/configure.cmd?rev=59129&r1=59128&r2=59129&view=diff ============================================================================== --- trunk/reactos/configure.cmd [iso-8859-1] (original) +++ trunk/reactos/configure.cmd [iso-8859-1] Fri May 31 21:04:28 2013 @@ -35,10 +35,10 @@ set CMAKE_GENERATOR="CodeBlocks - MinGW Makefiles" ) else if /I "%1" == "Eclipse" ( set CMAKE_GENERATOR="Eclipse CDT4 - MinGW Makefiles" - ) else if /I "%1" == "Ninja" ( + ) else if /I "%1" == "Makefiles" ( + set CMAKE_GENERATOR="MinGW Makefiles" + ) else ( set CMAKE_GENERATOR="Ninja" - ) else ( - set CMAKE_GENERATOR="MinGW Makefiles" ) ) else if defined DDK_TARGET_OS ( @@ -128,12 +128,10 @@ set CMAKE_GENERATOR="CodeBlocks - NMake Makefiles" ) else if /I "%1" == "Eclipse" ( set CMAKE_GENERATOR="Eclipse CDT4 - NMake Makefiles" - ) else if /I "%1" == "JOM" ( - set CMAKE_GENERATOR="NMake Makefiles JOM" - ) else if /I "%1" == "Ninja" ( + ) else if /I "%1" == "Makefiles" ( + set CMAKE_GENERATOR="NMake Makefiles" + ) else ( set CMAKE_GENERATOR="Ninja" - ) else ( - set CMAKE_GENERATOR="NMake Makefiles" ) ) Modified: trunk/reactos/configure.sh URL: http://svn.reactos.org/svn/reactos/trunk/reactos/configure.sh?rev=59129&r1=59128&r2=59129&view=diff ============================================================================== --- trunk/reactos/configure.sh [iso-8859-1] (original) +++ trunk/reactos/configure.sh [iso-8859-1] Fri May 31 21:04:28 2013 @@ -9,10 +9,10 @@ ARCH=$ROS_ARCH REACTOS_SOURCE_DIR=$(cd `dirname $0` && pwd) REACTOS_OUTPUT_PATH=output-$BUILD_ENVIRONMENT-$ARCH -if [ "$1" = "ninja" ]; then +if [ ("$1" = "Makefiles") -o ("$1" = "makefiles") ]; then +CMAKE_GENERATOR="Unix Makefiles" +else CMAKE_GENERATOR="Ninja" -else -CMAKE_GENERATOR="Unix Makefiles" fi if [ "$REACTOS_SOURCE_DIR" = "$PWD" ]; then