X-Git-Url: https://git.reactos.org/?p=reactos.git;a=blobdiff_plain;f=toolchain-msvc.cmake;h=e0f2b2b8b3543cd9388baeb785c261880cf8fa09;hp=3b675f2de69169cb9d1638d2327ecd8deba02646;hb=511ad21fae04d129338d26f375184499d9b1089d;hpb=18ac12569f32eb04c6e96545f67cc583b1c6bcaf

diff --git a/toolchain-msvc.cmake b/toolchain-msvc.cmake
index 3b675f2de69..e0f2b2b8b35 100644
--- a/toolchain-msvc.cmake
+++ b/toolchain-msvc.cmake
@@ -1,14 +1,34 @@
 
+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} MATCHES amd64)
+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()
@@ -16,6 +36,6 @@ set(CMAKE_ASM_COMPILER_ID "VISUAL")
 
 set(CMAKE_C_STANDARD_LIBRARIES "" CACHE INTERNAL "")
 
-if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86")
+if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86")
     add_definitions(-D__i386__)
 endif()