[CSRSRV]: Fix two DPRINTs.

[reactos.git] / reactos / configure.cmd

diff --git a/reactos/configure.cmd b/reactos/configure.cmd
index e78d932..186afb7 100755 (executable)
--- a/reactos/configure.cmd
+++ b/reactos/configure.cmd
@@ -41,26 +41,14 @@ if defined ROS_ARCH (
         set CMAKE_GENERATOR="Ninja"\r
     )\r
 \r
-) else if defined DDK_TARGET_OS (\r
-    echo Detected DDK/WDK for %DDK_TARGET_OS%-%_BUILDARCH%%\r
-    set BUILD_ENVIRONMENT=WDK\r
-    if "%_BUILDARCH%" == "x86" (\r
-        set ARCH=i386\r
-    ) else if "%_BUILDARCH%" == "AMD64" (\r
-        set ARCH=amd64\r
-    )\r
-    set USE_VSCMD=1\r
-    set USE_WDK_HEADERS=0\r
-\r
 ) else if defined VCINSTALLDIR (\r
     :: VS command prompt does not put this in environment vars\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 "14." > NUL && set BUILD_ENVIRONMENT=VS8\r
-    cl 2>&1 | find "15." > NUL && set BUILD_ENVIRONMENT=VS9\r
-    cl 2>&1 | find "16." > NUL && set BUILD_ENVIRONMENT=VS10\r
-    cl 2>&1 | find "17." > NUL && set BUILD_ENVIRONMENT=VS11\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
     if not defined BUILD_ENVIRONMENT (\r
         echo Error: Visual Studio version too old or version detection failed.\r
         exit /b\r
@@ -68,19 +56,7 @@ if defined ROS_ARCH (
 \r
     echo Detected Visual Studio Environment !BUILD_ENVIRONMENT!-!ARCH!\r
     if /I "%1" == "VSSolution" (\r
-        if "!BUILD_ENVIRONMENT!" == "VS8" (\r
-            if "!ARCH!" == "amd64" (\r
-                set CMAKE_GENERATOR="Visual Studio 8 2005 Win64"\r
-            ) else (\r
-                set CMAKE_GENERATOR="Visual Studio 8 2005"\r
-            )\r
-        ) else 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 "!BUILD_ENVIRONMENT!" == "VS10" (\r
             if "!ARCH!" == "amd64" (\r
                 set CMAKE_GENERATOR="Visual Studio 10 Win64"\r
             ) else (\r
@@ -94,23 +70,20 @@ if defined ROS_ARCH (
             ) else (\r
                 set CMAKE_GENERATOR="Visual Studio 11"\r
             )\r
+        ) else if "!BUILD_ENVIRONMENT!" == "VS12" (\r
+            if "!ARCH!" == "amd64" (\r
+                set CMAKE_GENERATOR="Visual Studio 12 Win64"\r
+            ) else if "!ARCH!" == "arm" (\r
+                set CMAKE_GENERATOR="Visual Studio 12 ARM"\r
+            ) else (\r
+                set CMAKE_GENERATOR="Visual Studio 12"\r
+            )\r
         )\r
     ) else (\r
         set USE_VSCMD=1\r
         echo This script defaults to Ninja. To use Visual Studio GUI specify "VSSolution" as a parameter.\r
     )\r
 \r
-) else if defined sdkdir (\r
-    echo Detected Windows SDK %TARGET_PLATFORM%-%TARGET_CPU%\r
-    if "%TARGET_CPU%" == "x86" (\r
-        set ARCH=i386\r
-    ) else if "%TARGET_CPU%" == "x64" (\r
-        set ARCH=amd64\r
-    )\r
-\r
-    set BUILD_ENVIRONMENT=SDK\r
-    set USE_VSCMD=1\r
-\r
 ) else (\r
     echo Error: Unable to detect build environment. Configure script failure.\r
     exit /b\r
@@ -178,8 +151,6 @@ if EXIST CMakeCache.txt (
 \r
 if "%BUILD_ENVIRONMENT%" == "MinGW" (\r
     cmake -G %CMAKE_GENERATOR% -DENABLE_CCACHE=0 -DPCH=0 -DCMAKE_TOOLCHAIN_FILE=toolchain-gcc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" "%REACTOS_SOURCE_DIR%"\r
-) else if "%BUILD_ENVIRONMENT%" == "WDK" (\r
-    cmake -G %CMAKE_GENERATOR% -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DUSE_WDK_HEADERS=%USE_WDK_HEADERS% -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%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
 )\r