X-Git-Url: https://git.reactos.org/?p=reactos.git;a=blobdiff_plain;f=toolchain-msvc.cmake;h=e0f2b2b8b3543cd9388baeb785c261880cf8fa09;hp=3d692605fca4c8b014007621afbc30e92ecba381;hb=d09e1398f83d71a7940ed02ee68e63fff2756cbc;hpb=122303c4ea9ff70a483355888e43b5976c79cb0e

diff --git a/toolchain-msvc.cmake b/toolchain-msvc.cmake
index 3d692605fca..e0f2b2b8b35 100644
--- a/toolchain-msvc.cmake
+++ b/toolchain-msvc.cmake
@@ -3,17 +3,32 @@ if(NOT ARCH)
     set(ARCH i386)
 endif()
 
+# Default to Debug for the build type
+if(NOT DEFINED CMAKE_BUILD_TYPE)
+    set(CMAKE_BUILD_TYPE "Debug" CACHE STRING
+        "Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel.")
+endif()
+
 # the name of the target operating system
 set(CMAKE_SYSTEM_NAME Windows)
 set(CMAKE_SYSTEM_PROCESSOR i686)
 
 # which compilers to use for C and C++
 set(CMAKE_C_COMPILER cl)
+
+if(ARCH STREQUAL "arm")
+    include(CMakeForceCompiler)
+    CMAKE_FORCE_CXX_COMPILER(cl MSVC)
+else()
 set(CMAKE_CXX_COMPILER cl)
+endif()
+
 set(CMAKE_MC_COMPILER mc)
 set(CMAKE_RC_COMPILER rc)
 if(ARCH STREQUAL "amd64")
     set(CMAKE_ASM_COMPILER ml64)
+elseif(ARCH STREQUAL "arm")
+    set(CMAKE_ASM_COMPILER armasm)
 else()
     set(CMAKE_ASM_COMPILER ml)
 endif()