Author: ion Date: Sat Feb 4 18:55:47 2017 New Revision: 73682
URL: http://svn.reactos.org/svn/reactos?rev=73682&view=rev Log: [CONFIGURE]: Better fix thanks to gigaherz.
Modified: trunk/reactos/configure.cmd
Modified: trunk/reactos/configure.cmd URL: http://svn.reactos.org/svn/reactos/trunk/reactos/configure.cmd?rev=73682&... ============================================================================== --- trunk/reactos/configure.cmd [iso-8859-1] (original) +++ trunk/reactos/configure.cmd [iso-8859-1] Sat Feb 4 18:55:47 2017 @@ -58,7 +58,7 @@ 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.00." > NUL && set VS_VERSION=14 - cl 2>&1 | find "19.10." > NUL && set VS_VERSION=14 + cl 2>&1 | find "19.10." > NUL && set VS_VERSION=15 if not defined VS_VERSION ( echo Error: Visual Studio version too old or version detection failed. endlocal @@ -147,6 +147,15 @@ ) 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" + ) ) ) else if /I "%1" == "RTC" ( echo Runtime checks enabled