Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 18:15:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Finally,...

Browse source 
... 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 ;) )

svn path=/trunk/; revision=59129
This commit is contained in:
Hermès Bélusca-Maïto 2013-05-31 21:04:28 +00:00
parent eabdc48e8a
commit 6b811ad8f5
2 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
reactos/configure.cmd
View file

@ -35,10 +35,10 @@ if defined ROS_ARCH (
set CMAKE_GENERATOR="CodeBlocks - MinGW Makefiles"
) else if /I "%1" == "Eclipse" (
set CMAKE_GENERATOR="Eclipse CDT4 - MinGW Makefiles"
) else if /I "%1" == "Ninja" (
set CMAKE_GENERATOR="Ninja"
) else (
) else if /I "%1" == "Makefiles" (
set CMAKE_GENERATOR="MinGW Makefiles"
) else (
set CMAKE_GENERATOR="Ninja"
)
) else if defined DDK_TARGET_OS (
@ -128,12 +128,10 @@ if %USE_NMAKE% == 1 (
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" (
set CMAKE_GENERATOR="Ninja"
) else (
) else if /I "%1" == "Makefiles" (
set CMAKE_GENERATOR="NMake Makefiles"
) else (
set CMAKE_GENERATOR="Ninja"
)
)

6
reactos/configure.sh
View file

@ -9,10 +9,10 @@ BUILD_ENVIRONMENT=MinGW
ARCH=$ROS_ARCH
REACTOS_SOURCE_DIR=$(cd `dirname $0` && pwd)
REACTOS_OUTPUT_PATH=output-$BUILD_ENVIRONMENT-$ARCH
if [ "$1" = "ninja" ]; then
CMAKE_GENERATOR="Ninja"
else
if [ ("$1" = "Makefiles") -o ("$1" = "makefiles") ]; then
CMAKE_GENERATOR="Unix Makefiles"
else
CMAKE_GENERATOR="Ninja"
fi
if [ "$REACTOS_SOURCE_DIR" = "$PWD" ]; then