[CMAKE]
authorTimo Kreuzer <timo.kreuzer@reactos.org>
Fri, 28 Jan 2011 17:40:36 +0000 (17:40 +0000)
committerTimo Kreuzer <timo.kreuzer@reactos.org>
Fri, 28 Jan 2011 17:40:36 +0000 (17:40 +0000)
- Preserve case of symbols when assembling (this is not default)
- link to msvcsup

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

msc.cmake
toolchain-msvc.cmake

index 91d2886..cdbbb5a 100644 (file)
--- a/msc.cmake
+++ b/msc.cmake
@@ -120,6 +120,7 @@ macro(set_module_type MODULE TYPE)
         set_image_base(${MODULE} 0x00010000)\r
         add_linkerflag(${MODULE} "/DRIVER")\r
         add_dependencies(${MODULE} bugcodes)\r
+        target_link_libraries(${MODULE} msvcsup)\r
     endif()\r
 endmacro()\r
 \r
@@ -157,7 +158,7 @@ macro(add_importlib_target _exports_file)
     # Assemble the stub file\r
     add_custom_command(\r
         OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.obj\r
-        COMMAND ${CMAKE_ASM_COMPILER} /nologo /Fo${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.obj /c /Ta ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.asm\r
+        COMMAND ${CMAKE_ASM_COMPILER} /nologo /Cp /Fo${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.obj /c /Ta ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.asm\r
         DEPENDS "${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.asm")\r
 \r
     # Add neccessary importlibs for redirections\r
index 218a27d..f87d337 100644 (file)
@@ -17,7 +17,7 @@ set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> <DEFINES> /I${REACTOS_SOURCE_DI
 \r
 SET(CMAKE_ASM_COMPILE_OBJECT\r
     "<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"\r
-    "<CMAKE_ASM_COMPILER> /nologo /Fo<OBJECT> /c /Ta <OBJECT>.tmp")\r
+    "<CMAKE_ASM_COMPILER> /nologo /Cp /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