[USBPORT] Start implementation USBPORT_AllocateBandwidthUSB2().

[reactos.git] / configure.cmd

diff --git a/configure.cmd b/configure.cmd
index 6b0c5df..8415dda 100755 (executable)
--- a/configure.cmd
+++ b/configure.cmd
@@ -60,6 +60,7 @@ if defined ROS_ARCH (
     cl 2>&1 | find "19.00." > NUL && set VS_VERSION=14
     cl 2>&1 | find "19.10." > NUL && set VS_VERSION=15
     cl 2>&1 | find "19.11." > NUL && set VS_VERSION=15
+    cl 2>&1 | find "19.12." > NUL && set VS_VERSION=15
     if not defined VS_VERSION (
         echo Error: Visual Studio version too old or version detection failed.
         endlocal
@@ -83,6 +84,7 @@ if not defined ARCH (
 )
 
 set NEW_STYLE_BUILD=1
+set USE_CLANG_CL=0
 
 REM Parse command line parameters
 :repeat
@@ -95,8 +97,6 @@ REM Parse command line parameters
             set CMAKE_GENERATOR="Eclipse CDT4 - MinGW Makefiles"
         ) else if /I "%1" == "Makefiles" (
             set CMAKE_GENERATOR="MinGW Makefiles"
-        ) else if /I "%1" == "clang" (
-            set MINGW_TOOCHAIN_FILE=toolchain-clang.cmake
         ) else (
             goto continue
         )
@@ -107,6 +107,8 @@ REM Parse command line parameters
             set CMAKE_GENERATOR="Eclipse CDT4 - NMake Makefiles"
         ) else if /I "%1" == "Makefiles" (
             set CMAKE_GENERATOR="NMake Makefiles"
+        ) else if /I "%1" == "clang" (
+            set USE_CLANG_CL=1
         ) else if /I "%1" == "VSSolution" (
             set VS_SOLUTION=1
             REM explicitly set VS version for project generator
@@ -239,6 +241,8 @@ if "%NEW_STYLE_BUILD%"=="0" (
 
 if "%BUILD_ENVIRONMENT%" == "MinGW" (
     cmake -G %CMAKE_GENERATOR% -DENABLE_CCACHE:BOOL=0 -DCMAKE_TOOLCHAIN_FILE:FILEPATH=%MINGW_TOOCHAIN_FILE% -DARCH:STRING=%ARCH% %BUILD_TOOLS_FLAG% %* "%REACTOS_SOURCE_DIR%"
+) 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%"
 )