call %2 x86
REM Configure host tools for x86.
- cmake -G %3 -DARCH:STRING=i386 %~dp0
+ cmake -G %3 -A Win32 -DARCH:STRING=i386 %~dp0
exit
)
REM Set default generator
set CMAKE_GENERATOR="Ninja"
-set CMAKE_GENERATOR_HOST=!CMAKE_GENERATOR!
+set CMAKE_ARCH=
REM Detect presence of cmake
cmd /c cmake --version 2>&1 | find "cmake version" > NUL || goto cmake_notfound
cl 2>&1 | find "x86" > NUL && set ARCH=i386
cl 2>&1 | find "x64" > NUL && set ARCH=amd64
cl 2>&1 | find "ARM" > NUL && set ARCH=arm
- cl 2>&1 | find "15.00." > NUL && set VS_VERSION=9
cl 2>&1 | find "16.00." > NUL && set VS_VERSION=10
cl 2>&1 | find "17.00." > NUL && set VS_VERSION=11
cl 2>&1 | find "18.00." > NUL && set VS_VERSION=12
cl 2>&1 | find "19.11." > NUL && set VS_VERSION=15
cl 2>&1 | find "19.12." > NUL && set VS_VERSION=15
cl 2>&1 | find "19.13." > NUL && set VS_VERSION=15
+ cl 2>&1 | find "19.14." > NUL && set VS_VERSION=15
+ cl 2>&1 | find "19.15." > NUL && set VS_VERSION=15
+ cl 2>&1 | find "19.16." > NUL && set VS_VERSION=15
+ cl 2>&1 | find "19.20." > NUL && set VS_VERSION=16
+ cl 2>&1 | find "19.21." > NUL && set VS_VERSION=16
+ cl 2>&1 | find "19.22." > NUL && set VS_VERSION=16
if not defined VS_VERSION (
- echo Error: Visual Studio version too old or version detection failed.
+ echo Error: Visual Studio version too old ^(before 10 ^(2010^)^) or version detection failed.
goto quit
)
set BUILD_ENVIRONMENT=VS
set VS_VERSION=%3
echo Visual Studio Environment set to !BUILD_ENVIRONMENT!!VS_VERSION!-!ARCH!
)
- if "!VS_VERSION!" == "9" (
- if "!ARCH!" == "amd64" (
- set CMAKE_GENERATOR="Visual Studio 9 2008 Win64"
- ) else (
- set CMAKE_GENERATOR="Visual Studio 9 2008"
- )
- ) else if "!VS_VERSION!" == "10" (
- if "!ARCH!" == "amd64" (
- set CMAKE_GENERATOR="Visual Studio 10 Win64"
- ) else (
- set CMAKE_GENERATOR="Visual Studio 10"
- )
- ) else if "!VS_VERSION!" == "11" (
- if "!ARCH!" == "amd64" (
- set CMAKE_GENERATOR="Visual Studio 11 Win64"
- ) else if "!ARCH!" == "arm" (
- set CMAKE_GENERATOR="Visual Studio 11 ARM"
- set CMAKE_GENERATOR_HOST="Visual Studio 11"
- ) else (
- set CMAKE_GENERATOR="Visual Studio 11"
- )
- ) else if "!VS_VERSION!" == "12" (
- if "!ARCH!" == "amd64" (
- set CMAKE_GENERATOR="Visual Studio 12 Win64"
- ) else if "!ARCH!" == "arm" (
- set CMAKE_GENERATOR="Visual Studio 12 ARM"
- set CMAKE_GENERATOR_HOST="Visual Studio 12"
- ) else (
- set CMAKE_GENERATOR="Visual Studio 12"
- )
- ) else if "!VS_VERSION!" == "14" (
- if "!ARCH!" == "amd64" (
- set CMAKE_GENERATOR="Visual Studio 14 Win64"
- ) else if "!ARCH!" == "arm" (
- set CMAKE_GENERATOR="Visual Studio 14 ARM"
- set CMAKE_GENERATOR_HOST="Visual Studio 14"
- ) else (
- set CMAKE_GENERATOR="Visual Studio 14"
- )
- ) else if "!VS_VERSION!" == "15" (
- if "!ARCH!" == "amd64" (
- set CMAKE_GENERATOR="Visual Studio 15 Win64"
- ) else if "!ARCH!" == "arm" (
- set CMAKE_GENERATOR="Visual Studio 15 ARM"
- set CMAKE_GENERATOR_HOST="Visual Studio 15"
- ) else (
- set CMAKE_GENERATOR="Visual Studio 15"
- )
+ set CMAKE_GENERATOR="Visual Studio !VS_VERSION!"
+ if "!ARCH!" == "i386" (
+ set CMAKE_ARCH=-A Win32
+ ) else if "!ARCH!" == "amd64" (
+ set CMAKE_ARCH=-A x64
+ ) else if "!ARCH!" == "arm" (
+ set CMAKE_ARCH=-A ARM
)
) else if /I "%1" == "RTC" (
echo Runtime checks enabled
REM Use x86 for ARM host tools
if "%ARCH%" == "arm" (
REM Launch new script instance for x86 host tools configuration
- start "Preparing host tools for ARM cross build..." /I /B /WAIT %~dp0configure.cmd arm_hosttools "%VSINSTALLDIR%VC\vcvarsall.bat" %CMAKE_GENERATOR_HOST%
+ start "Preparing host tools for ARM cross build..." /I /B /WAIT %~dp0configure.cmd arm_hosttools "%VSINSTALLDIR%VC\vcvarsall.bat" %CMAKE_GENERATOR%
) else (
- cmake -G %CMAKE_GENERATOR% -DARCH:STRING=%ARCH% "%REACTOS_SOURCE_DIR%"
+ cmake -G %CMAKE_GENERATOR% %CMAKE_ARCH% -DARCH:STRING=%ARCH% "%REACTOS_SOURCE_DIR%"
)
cd..
) else if %USE_CLANG_CL% == 1 (
cmake -G %CMAKE_GENERATOR% -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=%ARCH% %BUILD_TOOLS_FLAG% -DUSE_CLANG_CL:BOOL=1 -DRUNTIME_CHECKS:BOOL=%VS_RUNTIME_CHECKS% %* "%REACTOS_SOURCE_DIR%"
) else (
- cmake -G %CMAKE_GENERATOR% -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=%ARCH% %BUILD_TOOLS_FLAG% -DRUNTIME_CHECKS:BOOL=%VS_RUNTIME_CHECKS% %* "%REACTOS_SOURCE_DIR%"
+ cmake -G %CMAKE_GENERATOR% %CMAKE_ARCH% -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=%ARCH% %BUILD_TOOLS_FLAG% -DRUNTIME_CHECKS:BOOL=%VS_RUNTIME_CHECKS% %* "%REACTOS_SOURCE_DIR%"
)
if "%NEW_STYLE_BUILD%"=="0" (