X-Git-Url: https://git.reactos.org/?p=reactos.git;a=blobdiff_plain;f=toolchain-msvc.cmake;h=3d692605fca4c8b014007621afbc30e92ecba381;hp=506fda901557c03456f896250d0ef1f4b564cfc5;hb=08b3bef0806bfae71570efdd0d0dc3aa33d3e095;hpb=4f2d0d54b06d38b03641352da0d6afb96e8b05e7

diff --git a/toolchain-msvc.cmake b/toolchain-msvc.cmake
index 506fda90155..3d692605fca 100644
--- a/toolchain-msvc.cmake
+++ b/toolchain-msvc.cmake
@@ -1,26 +1,26 @@
-
-# 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)
-set(CMAKE_CXX_COMPILER cl)
-set(CMAKE_RC_COMPILER rc)
-if(${ARCH} MATCHES amd64)
-    set(CMAKE_ASM_COMPILER ml64)
-else()
-    set(CMAKE_ASM_COMPILER ml)
-endif()
-
-set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> <DEFINES> /I${REACTOS_SOURCE_DIR}/include/psdk /I${REACTOS_BINARY_DIR}/include/psdk /I${REACTOS_SOURCE_DIR}/include /I${REACTOS_SOURCE_DIR}/include/reactos /I${REACTOS_BINARY_DIR}/include/reactos /I${REACTOS_SOURCE_DIR}/include/reactos/wine /I${REACTOS_SOURCE_DIR}/include/crt /I${REACTOS_SOURCE_DIR}/include/crt/mingw32 /fo <OBJECT> <SOURCE>")
-
-set(CMAKE_ASM_COMPILE_OBJECT
-    "<CMAKE_C_COMPILER> /nologo /X /I${REACTOS_SOURCE_DIR}/include/asm /I${REACTOS_BINARY_DIR}/include/asm <FLAGS> <DEFINES> /D__ASM__ /D_USE_ML /EP /c <SOURCE> > <OBJECT>.tmp"
-    "<CMAKE_ASM_COMPILER> /nologo /Cp /Fo<OBJECT> /c /Ta <OBJECT>.tmp")
-
-set(CMAKE_C_STANDARD_LIBRARIES "" CACHE INTERNAL "")
-
-if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86")
-    add_definitions(-D__i386__)
-endif()
+
+if(NOT ARCH)
+    set(ARCH i386)
+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)
+set(CMAKE_CXX_COMPILER cl)
+set(CMAKE_MC_COMPILER mc)
+set(CMAKE_RC_COMPILER rc)
+if(ARCH STREQUAL "amd64")
+    set(CMAKE_ASM_COMPILER ml64)
+else()
+    set(CMAKE_ASM_COMPILER ml)
+endif()
+set(CMAKE_ASM_COMPILER_ID "VISUAL")
+
+set(CMAKE_C_STANDARD_LIBRARIES "" CACHE INTERNAL "")
+
+if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86")
+    add_definitions(-D__i386__)
+endif()