[ros-diffs] [tkreuzer] 49667: [CMAKE] - Pass /nologo to the assembler - don't implicitly link msvcrt and kernel32

tkreuzer at svn.reactos.org tkreuzer at svn.reactos.org
Sat Nov 20 16:21:25 UTC 2010


Author: tkreuzer
Date: Sat Nov 20 16:21:24 2010
New Revision: 49667

URL: http://svn.reactos.org/svn/reactos?rev=49667&view=rev
Log:
[CMAKE]
- Pass /nologo to the assembler
- don't implicitly link msvcrt and kernel32

Modified:
    branches/cmake-bringup/msc.cmake
    branches/cmake-bringup/toolchain-msvc.cmake

Modified: branches/cmake-bringup/msc.cmake
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/msc.cmake?rev=49667&r1=49666&r2=49667&view=diff
==============================================================================
--- branches/cmake-bringup/msc.cmake [iso-8859-1] (original)
+++ branches/cmake-bringup/msc.cmake [iso-8859-1] Sat Nov 20 16:21:24 2010
@@ -73,7 +73,6 @@
 			message(STATUS "${MODULE} has no base address")
 		endif()
 		target_link_libraries(${MODULE} mingw_common mingw_dllmain)
-		add_importlibs(${MODULE} msvcrt kernel32)
         add_linkerflag(${MODULE} "/DLL")
     endif()
 

Modified: branches/cmake-bringup/toolchain-msvc.cmake
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/toolchain-msvc.cmake?rev=49667&r1=49666&r2=49667&view=diff
==============================================================================
--- branches/cmake-bringup/toolchain-msvc.cmake [iso-8859-1] (original)
+++ branches/cmake-bringup/toolchain-msvc.cmake [iso-8859-1] Sat Nov 20 16:21:24 2010
@@ -36,7 +36,7 @@
 
 SET(CMAKE_ASM_COMPILE_OBJECT 
     "<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"
-    "<CMAKE_ASM_COMPILER> /Fo<OBJECT> /c /Ta <OBJECT>.tmp")
+    "<CMAKE_ASM_COMPILER> /nologo /Fo<OBJECT> /c /Ta <OBJECT>.tmp")
 
 set(CMAKE_C_FLAGS_INIT "/DWIN32 /D_WINDOWS /W1 /Zm1000")
 set(CMAKE_C_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Zi  /Ob0 /Od")




More information about the Ros-diffs mailing list