call %2 x86\r
\r
:: Configure host tools for x86\r
- cmake -G %3 -DARCH=i386 %~dp0\r
+ cmake -G %3 -DARCH:STRING=i386 %~dp0\r
exit\r
)\r
\r
:: Get the source root directory\r
set REACTOS_SOURCE_DIR=%~dp0\r
-set USE_NMAKE=0\r
+set USE_VSCMD=0\r
\r
:: Detect presence of cmake\r
cmd /c cmake --version 2>&1 | find "cmake version" > NUL || goto cmake_notfound\r
set CMAKE_GENERATOR="CodeBlocks - MinGW Makefiles"\r
) else if /I "%1" == "Eclipse" (\r
set CMAKE_GENERATOR="Eclipse CDT4 - MinGW Makefiles"\r
- ) else if /I "%1" == "Ninja" (\r
+ ) else if /I "%1" == "Makefiles" (\r
+ set CMAKE_GENERATOR="MinGW Makefiles"\r
+ ) else if /I "%1" == "clang" (\r
+ set BUILD_ENVIRONMENT=Clang\r
set CMAKE_GENERATOR="Ninja"\r
) else (\r
- set CMAKE_GENERATOR="MinGW Makefiles"\r
- )\r
-\r
-) else if defined DDK_TARGET_OS (\r
- echo Detected DDK/WDK for %DDK_TARGET_OS%-%_BUILDARCH%%\r
- set BUILD_ENVIRONMENT=WDK\r
- if "%_BUILDARCH%" == "x86" (\r
- set ARCH=i386\r
- ) else if "%_BUILDARCH%" == "AMD64" (\r
- set ARCH=amd64\r
+ set CMAKE_GENERATOR="Ninja"\r
)\r
- set USE_NMAKE=1\r
- set USE_WDK_HEADERS=0\r
\r
) else if defined VCINSTALLDIR (\r
:: VS command prompt does not put this in environment vars\r
cl 2>&1 | find "x86" > NUL && set ARCH=i386\r
cl 2>&1 | find "x64" > NUL && set ARCH=amd64\r
cl 2>&1 | find "ARM" > NUL && set ARCH=arm\r
- cl 2>&1 | find "14." > NUL && set BUILD_ENVIRONMENT=VS8\r
- cl 2>&1 | find "15." > NUL && set BUILD_ENVIRONMENT=VS9\r
- cl 2>&1 | find "16." > NUL && set BUILD_ENVIRONMENT=VS10\r
- cl 2>&1 | find "17." > NUL && set BUILD_ENVIRONMENT=VS11\r
+ cl 2>&1 | find "15.00." > NUL && set BUILD_ENVIRONMENT=VS9\r
+ cl 2>&1 | find "16.00." > NUL && set BUILD_ENVIRONMENT=VS10\r
+ cl 2>&1 | find "17.00." > NUL && set BUILD_ENVIRONMENT=VS11\r
+ cl 2>&1 | find "18.00." > NUL && set BUILD_ENVIRONMENT=VS12\r
if not defined BUILD_ENVIRONMENT (\r
echo Error: Visual Studio version too old or version detection failed.\r
exit /b\r
\r
echo Detected Visual Studio Environment !BUILD_ENVIRONMENT!-!ARCH!\r
if /I "%1" == "VSSolution" (\r
- if "!BUILD_ENVIRONMENT!" == "VS8" (\r
- if "!ARCH!" == "amd64" (\r
- set CMAKE_GENERATOR="Visual Studio 8 2005 Win64"\r
- ) else (\r
- set CMAKE_GENERATOR="Visual Studio 8 2005"\r
- )\r
- ) else if "!BUILD_ENVIRONMENT!" == "VS9" (\r
+ if "!BUILD_ENVIRONMENT!" == "VS9" (\r
if "!ARCH!" == "amd64" (\r
set CMAKE_GENERATOR="Visual Studio 9 2008 Win64"\r
) else (\r
) else (\r
set CMAKE_GENERATOR="Visual Studio 11"\r
)\r
+ ) else if "!BUILD_ENVIRONMENT!" == "VS12" (\r
+ if "!ARCH!" == "amd64" (\r
+ set CMAKE_GENERATOR="Visual Studio 12 Win64"\r
+ ) else if "!ARCH!" == "arm" (\r
+ set CMAKE_GENERATOR="Visual Studio 12 ARM"\r
+ ) else (\r
+ set CMAKE_GENERATOR="Visual Studio 12"\r
+ )\r
)\r
) else (\r
- set USE_NMAKE=1\r
- echo This script defaults to nmake. To use Visual Studio GUI specify "VSSolution" as a parameter.\r
+ set USE_VSCMD=1\r
+ echo This script defaults to Ninja. To use Visual Studio GUI specify "VSSolution" as a parameter.\r
)\r
\r
-) else if defined sdkdir (\r
- echo Detected Windows SDK %TARGET_PLATFORM%-%TARGET_CPU%\r
- if "%TARGET_CPU%" == "x86" (\r
- set ARCH=i386\r
- ) else if "%TARGET_CPU%" == "x64" (\r
- set ARCH=amd64\r
- )\r
-\r
- set BUILD_ENVIRONMENT=SDK\r
- set USE_NMAKE=1\r
-\r
) else (\r
echo Error: Unable to detect build environment. Configure script failure.\r
exit /b\r
exit /b\r
)\r
\r
-:: Detect nmake generator\r
-if %USE_NMAKE% == 1 (\r
+:: Detect VS command line generator\r
+if %USE_VSCMD% == 1 (\r
if /I "%1" == "CodeBlocks" (\r
set CMAKE_GENERATOR="CodeBlocks - NMake Makefiles"\r
) else if /I "%1" == "Eclipse" (\r
set CMAKE_GENERATOR="Eclipse CDT4 - NMake Makefiles"\r
- ) else if /I "%1" == "JOM" (\r
- set CMAKE_GENERATOR="NMake Makefiles JOM"\r
- ) else if /I "%1" == "Ninja" (\r
- set CMAKE_GENERATOR="Ninja"\r
- ) else (\r
+ ) else if /I "%1" == "Makefiles" (\r
set CMAKE_GENERATOR="NMake Makefiles"\r
+ ) else (\r
+ set CMAKE_GENERATOR="Ninja"\r
)\r
)\r
\r
:: Launch new script instance for x86 host tools configuration\r
start "Preparing host tools for ARM cross build..." /I /B /WAIT %~dp0configure.cmd arm_hosttools "%VSINSTALLDIR%VC\vcvarsall.bat" %CMAKE_GENERATOR%\r
) else (\r
- cmake -G %CMAKE_GENERATOR% -DARCH=%ARCH% "%REACTOS_SOURCE_DIR%"\r
+ cmake -G %CMAKE_GENERATOR% -DARCH:STRING=%ARCH% "%REACTOS_SOURCE_DIR%"\r
)\r
\r
cd..\r
)\r
\r
if "%BUILD_ENVIRONMENT%" == "MinGW" (\r
- cmake -G %CMAKE_GENERATOR% -DENABLE_CCACHE=0 -DPCH=0 -DCMAKE_TOOLCHAIN_FILE=toolchain-gcc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" "%REACTOS_SOURCE_DIR%"\r
-) else if "%BUILD_ENVIRONMENT%" == "WDK" (\r
- cmake -G %CMAKE_GENERATOR% -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DUSE_WDK_HEADERS=%USE_WDK_HEADERS% -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" "%REACTOS_SOURCE_DIR%"\r
+ cmake -G %CMAKE_GENERATOR% -DENABLE_CCACHE:BOOL=0 -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-gcc.cmake -DARCH:STRING=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:PATH="%REACTOS_BUILD_TOOLS_DIR%" "%REACTOS_SOURCE_DIR%"\r
+) else if "%BUILD_ENVIRONMENT%" == "Clang" (\r
+ cmake -G %CMAKE_GENERATOR% -DENABLE_CCACHE:BOOL=0 -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-clang.cmake -DARCH:STRING=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:PATH="%REACTOS_BUILD_TOOLS_DIR%" "%REACTOS_SOURCE_DIR%"\r
) else (\r
- cmake -G %CMAKE_GENERATOR% -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" "%REACTOS_SOURCE_DIR%"\r
+ cmake -G %CMAKE_GENERATOR% -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:PATH="%REACTOS_BUILD_TOOLS_DIR%" "%REACTOS_SOURCE_DIR%"\r
)\r
\r
cd..\r
\r
-echo Configure script complete! Enter directories and execute appropriate build commands(ex: make, nmake, jom, etc...).\r
+echo Configure script complete^^! Enter directories and execute appropriate build commands (ex: ninja, make, nmake, etc...).\r
exit /b\r
\r
:cmake_notfound\r
- echo Unable to find cmake, if it is installed, check your PATH variable.\r
- exit /b\r
+echo Unable to find cmake, if it is installed, check your PATH variable.\r
+exit /b\r