From 09d50a578434d93b18568dc12a555bf191889242 Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Fri, 28 Jan 2011 17:40:36 +0000 Subject: [PATCH] [CMAKE] - Preserve case of symbols when assembling (this is not default) - link to msvcsup svn path=/branches/cmake-bringup/; revision=50536 --- msc.cmake | 3 ++- toolchain-msvc.cmake | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/msc.cmake b/msc.cmake index 91d28862b76..cdbbb5a7bc8 100644 --- a/msc.cmake +++ b/msc.cmake @@ -120,6 +120,7 @@ macro(set_module_type MODULE TYPE) set_image_base(${MODULE} 0x00010000) add_linkerflag(${MODULE} "/DRIVER") add_dependencies(${MODULE} bugcodes) + target_link_libraries(${MODULE} msvcsup) endif() endmacro() @@ -157,7 +158,7 @@ macro(add_importlib_target _exports_file) # Assemble the stub file add_custom_command( OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.obj - COMMAND ${CMAKE_ASM_COMPILER} /nologo /Fo${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.obj /c /Ta ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.asm + 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 DEPENDS "${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.asm") # Add neccessary importlibs for redirections diff --git a/toolchain-msvc.cmake b/toolchain-msvc.cmake index 218a27d2bf7..f87d33722f3 100644 --- a/toolchain-msvc.cmake +++ b/toolchain-msvc.cmake @@ -17,7 +17,7 @@ set(CMAKE_RC_COMPILE_OBJECT " /I${REACTOS_SOURCE_DI SET(CMAKE_ASM_COMPILE_OBJECT " /nologo /X /I${REACTOS_SOURCE_DIR}/include/asm /I${REACTOS_BINARY_DIR}/include/asm /D__ASM__ /D_USE_ML /EP /c > .tmp" - " /nologo /Fo /c /Ta .tmp") + " /nologo /Cp /Fo /c /Ta .tmp") set(CMAKE_C_FLAGS_INIT "/DWIN32 /D_WINDOWS /W1 /Zm1000") set(CMAKE_C_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Zi /Ob0 /Od") -- 2.17.1