From 53dbf738e55dfc5e3f8edf4be34757ecbe71427c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Sun, 14 Jul 2013 11:33:26 +0000 Subject: [PATCH] [WINSRV] Fix a delayed-imports problem, catched by Timo and Thomas with a MSVC build. Caused by the fact that the static library consrv specified delayed imports for it, thinking that they will be added to the list of delayed imports of winsrv. In fact it doesn't work and those imports become real imports. svn path=/trunk/; revision=59480 --- reactos/win32ss/user/winsrv/CMakeLists.txt | 7 ++++--- reactos/win32ss/user/winsrv/consrv.cmake | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/reactos/win32ss/user/winsrv/CMakeLists.txt b/reactos/win32ss/user/winsrv/CMakeLists.txt index 39f5deb3100..15becacf8eb 100644 --- a/reactos/win32ss/user/winsrv/CMakeLists.txt +++ b/reactos/win32ss/user/winsrv/CMakeLists.txt @@ -18,12 +18,13 @@ add_library(winsrv SHARED ${SOURCE}) # Add the components target_link_libraries(winsrv consrv usersrv) -target_link_libraries(winsrv win32ksys ${PSEH_LIB}) # win32ksys because of NtUser...() +# Add win32ksys because of NtUser...() +target_link_libraries(winsrv win32ksys ${PSEH_LIB} ${CONSRV_TARGET_LINK_LIBS}) set_module_type(winsrv win32dll UNICODE) -add_importlibs(winsrv msvcrt kernel32 ntdll csrsrv) -add_delay_importlibs(winsrv user32 gdi32 advapi32) +add_importlibs(winsrv msvcrt kernel32 ntdll csrsrv ${CONSRV_IMPORT_LIBS}) +add_delay_importlibs(winsrv user32 gdi32 advapi32 ${CONSRV_DELAY_IMPORT_LIBS}) add_dependencies(winsrv bugcodes) add_cd_file(TARGET winsrv DESTINATION reactos/system32 FOR all) diff --git a/reactos/win32ss/user/winsrv/consrv.cmake b/reactos/win32ss/user/winsrv/consrv.cmake index faa44c6422d..ccf69fcf54a 100644 --- a/reactos/win32ss/user/winsrv/consrv.cmake +++ b/reactos/win32ss/user/winsrv/consrv.cmake @@ -45,8 +45,8 @@ endif() add_library(consrv ${CONSRV_SOURCE}) #add_object_library(consrv ${CONSRV_SOURCE}) -add_importlibs(consrv psapi) # And the default ones from winsrv -add_delay_importlibs(consrv ole32) # And the default ones from winsrv -target_link_libraries(consrv uuid) # And the default ones from winsrv +list(APPEND CONSRV_IMPORT_LIBS psapi) +list(APPEND CONSRV_DELAY_IMPORT_LIBS ole32) +list(APPEND CONSRV_TARGET_LINK_LIBS uuid) set_module_type(consrv module UNICODE)