[CMAKE]

- Pass /nologo to the assembler
- don't implicitly link msvcrt and kernel32

svn path=/branches/cmake-bringup/; revision=49667

diff --git a/msc.cmake b/msc.cmake
index 485449a..7ffb866 100644 (file)
--- a/msc.cmake
+++ b/msc.cmake
@@ -73,7 +73,6 @@ macro(set_module_type MODULE TYPE)
                        message(STATUS "${MODULE} has no base address")\r
                endif()\r
                target_link_libraries(${MODULE} mingw_common mingw_dllmain)\r
-               add_importlibs(${MODULE} msvcrt kernel32)\r
         add_linkerflag(${MODULE} "/DLL")\r
     endif()\r
 \r

diff --git a/toolchain-msvc.cmake b/toolchain-msvc.cmake
index 9df5664..a554e1c 100644 (file)
--- a/toolchain-msvc.cmake
+++ b/toolchain-msvc.cmake
@@ -36,7 +36,7 @@ SET(CMAKE_IDL_COMPILE_OBJECT "<CMAKE_IDL_COMPILER> <FLAGS> <DEFINES> /win32 /Dst
 \r
 SET(CMAKE_ASM_COMPILE_OBJECT \r
     "<CMAKE_C_COMPILER> /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"\r
-    "<CMAKE_ASM_COMPILER> /Fo<OBJECT> /c /Ta <OBJECT>.tmp")\r
+    "<CMAKE_ASM_COMPILER> /nologo /Fo<OBJECT> /c /Ta <OBJECT>.tmp")\r
 \r
 set(CMAKE_C_FLAGS_INIT "/DWIN32 /D_WINDOWS /W1 /Zm1000")\r
 set(CMAKE_C_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Zi  /Ob0 /Od")\r