Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-23 08:55:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINSRV]

Browse source 
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
This commit is contained in:
Hermès Bélusca-Maïto 2013-07-14 11:33:26 +00:00
parent d16e22b423
commit 53dbf738e5
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
reactos/win32ss/user/winsrv/CMakeLists.txt
View file

@ -18,12 +18,13 @@ add_library(winsrv SHARED ${SOURCE})
# Add the components # Add the components
target_link_libraries(winsrv consrv usersrv) 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) set_module_type(winsrv win32dll UNICODE)
add_importlibs(winsrv msvcrt kernel32 ntdll csrsrv) add_importlibs(winsrv msvcrt kernel32 ntdll csrsrv ${CONSRV_IMPORT_LIBS})
add_delay_importlibs(winsrv user32 gdi32 advapi32) add_delay_importlibs(winsrv user32 gdi32 advapi32 ${CONSRV_DELAY_IMPORT_LIBS})
add_dependencies(winsrv bugcodes) add_dependencies(winsrv bugcodes)
add_cd_file(TARGET winsrv DESTINATION reactos/system32 FOR all) add_cd_file(TARGET winsrv DESTINATION reactos/system32 FOR all)

6
reactos/win32ss/user/winsrv/consrv.cmake
View file

@ -45,8 +45,8 @@ endif()
add_library(consrv ${CONSRV_SOURCE}) add_library(consrv ${CONSRV_SOURCE})
#add_object_library(consrv ${CONSRV_SOURCE}) #add_object_library(consrv ${CONSRV_SOURCE})
add_importlibs(consrv psapi) # And the default ones from winsrv list(APPEND CONSRV_IMPORT_LIBS psapi)
add_delay_importlibs(consrv ole32) # And the default ones from winsrv list(APPEND CONSRV_DELAY_IMPORT_LIBS ole32)
target_link_libraries(consrv uuid) # And the default ones from winsrv list(APPEND CONSRV_TARGET_LINK_LIBS uuid)
set_module_type(consrv module UNICODE) set_module_type(consrv module UNICODE)