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
set CMAKE_GENERATOR="Eclipse CDT4 - MinGW Makefiles"\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="Ninja"\r
)\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 "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
\r
echo Detected Visual Studio Environment !BUILD_ENVIRONMENT!-!ARCH!\r
if /I "%1" == "VSSolution" (\r
- if "!BUILD_ENVIRONMENT!" == "VS10" (\r
+ if "!BUILD_ENVIRONMENT!" == "VS9" (\r
+ if "!ARCH!" == "amd64" (\r
+ set CMAKE_GENERATOR="Visual Studio 9 2008 Win64"\r
+ ) else (\r
+ set CMAKE_GENERATOR="Visual Studio 9 2008"\r
+ )\r
+ ) else if "!BUILD_ENVIRONMENT!" == "VS10" (\r
if "!ARCH!" == "amd64" (\r
set CMAKE_GENERATOR="Visual Studio 10 Win64"\r
) else (\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 -DCMAKE_TOOLCHAIN_FILE=toolchain-gcc.cmake -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