[NPFS]

[reactos.git] / reactos / configure.cmd

diff --git a/reactos/configure.cmd b/reactos/configure.cmd
index cca0412..dbf87fd 100755 (executable)
--- a/reactos/configure.cmd
+++ b/reactos/configure.cmd
@@ -26,7 +26,7 @@ if /I "%1" == "arm_hosttools" (
     REM This launches %VSINSTALLDIR%VS\vcvarsall.bat\r
     call %2 x86\r
 \r
-    REM Configure host tools for x86\r
+    REM Configure host tools for x86.\r
     cmake -G %3 -DARCH:STRING=i386 %~dp0\r
     exit\r
 )\r
@@ -58,6 +58,7 @@ if defined ROS_ARCH (
     cl 2>&1 | find "17.00." > NUL && set VS_VERSION=11\r
     cl 2>&1 | find "18.00." > NUL && set VS_VERSION=12\r
     cl 2>&1 | find "19.00." > NUL && set VS_VERSION=14\r
+    cl 2>&1 | find "19.10." > NUL && set VS_VERSION=15\r
     if not defined VS_VERSION (\r
         echo Error: Visual Studio version too old or version detection failed.\r
         endlocal\r
@@ -146,6 +147,15 @@ REM Parse command line parameters
                 ) else (\r
                     set CMAKE_GENERATOR="Visual Studio 14"\r
                 )\r
+            ) else if "!VS_VERSION!" == "15" (\r
+                if "!ARCH!" == "amd64" (\r
+                    set CMAKE_GENERATOR="Visual Studio 15 Win64"\r
+                ) else if "!ARCH!" == "arm" (\r
+                    set CMAKE_GENERATOR="Visual Studio 15 ARM"\r
+                    set CMAKE_GENERATOR_HOST="Visual Studio 15"\r
+                ) else (\r
+                    set CMAKE_GENERATOR="Visual Studio 15"\r
+                )\r
             )\r
         ) else if /I "%1" == "RTC" (\r
             echo Runtime checks enabled\r
@@ -214,6 +224,7 @@ if "%NEW_STYLE_BUILD%"=="0" (
 \r
 if EXIST CMakeCache.txt (\r
     del CMakeCache.txt /q\r
+    del host-tools\CMakeCache.txt /q\r
 )\r
 \r
 if "%NEW_STYLE_BUILD%"=="0" (\r