diff --git a/reactos/dll/win32/advapi32/CMakeLists.txt b/reactos/dll/win32/advapi32/CMakeLists.txt index 43478cf7572..384afdd7f66 100644 --- a/reactos/dll/win32/advapi32/CMakeLists.txt +++ b/reactos/dll/win32/advapi32/CMakeLists.txt @@ -55,17 +55,14 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/svcctl_c.c) add_library(advapi32 SHARED ${SOURCE}) - set_module_type(advapi32 win32dll UNICODE) - -target_link_libraries(advapi32 - wine - ${PSEH_LIB}) - -add_importlibs(advapi32 rpcrt4 msvcrt kernel32 ntdll) +target_link_libraries(advapi32 wine ${PSEH_LIB}) +add_delay_importlibs(advapi32 rpcrt4) +add_importlibs(advapi32 msvcrt kernel32 ntdll) add_pch(advapi32 advapi32.h ${CMAKE_CURRENT_BINARY_DIR}/lsa_c.h ${CMAKE_CURRENT_BINARY_DIR}/eventlogrpc_c.h) + add_cd_file(TARGET advapi32 DESTINATION reactos/system32 FOR all) add_importlib_target(advapi32.spec) diff --git a/reactos/dll/win32/comctl32/CMakeLists.txt b/reactos/dll/win32/comctl32/CMakeLists.txt index 177794a7fa1..6f073bde8b2 100644 --- a/reactos/dll/win32/comctl32/CMakeLists.txt +++ b/reactos/dll/win32/comctl32/CMakeLists.txt @@ -55,17 +55,14 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/comctl32.def) add_library(comctl32 SHARED ${SOURCE}) - set_module_type(comctl32 win32dll UNICODE) - target_link_libraries(comctl32 uuid wine) +add_delay_importlibs(comctl32 winmm uxtheme) add_importlibs(comctl32 user32 gdi32 advapi32 - winmm - uxtheme msvcrt kernel32 ntdll) diff --git a/reactos/dll/win32/comdlg32/CMakeLists.txt b/reactos/dll/win32/comdlg32/CMakeLists.txt index 90918029bb6..cd053530cd1 100644 --- a/reactos/dll/win32/comdlg32/CMakeLists.txt +++ b/reactos/dll/win32/comdlg32/CMakeLists.txt @@ -23,10 +23,9 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/comdlg32.def) add_library(comdlg32 SHARED ${SOURCE}) - set_module_type(comdlg32 win32dll) - target_link_libraries(comdlg32 uuid wine) +add_delay_importlibs(comdlg32 ole32) add_importlibs(comdlg32 shell32 @@ -36,7 +35,6 @@ add_importlibs(comdlg32 user32 gdi32 advapi32 - ole32 msvcrt kernel32 ntdll) diff --git a/reactos/dll/win32/cryptnet/CMakeLists.txt b/reactos/dll/win32/cryptnet/CMakeLists.txt index 51200f6a14f..e7266cc422f 100644 --- a/reactos/dll/win32/cryptnet/CMakeLists.txt +++ b/reactos/dll/win32/cryptnet/CMakeLists.txt @@ -10,14 +10,12 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/cryptnet.def) add_library(cryptnet SHARED ${SOURCE}) - set_module_type(cryptnet win32dll) - target_link_libraries(cryptnet wine) +add_delay_importlibs(cryptnet wininet) add_importlibs(cryptnet crypt32 - wininet msvcrt kernel32 ntdll) diff --git a/reactos/dll/win32/cryptui/CMakeLists.txt b/reactos/dll/win32/cryptui/CMakeLists.txt index 17682b820a3..ba4c382ec0d 100644 --- a/reactos/dll/win32/cryptui/CMakeLists.txt +++ b/reactos/dll/win32/cryptui/CMakeLists.txt @@ -16,10 +16,9 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/cryptui.def) add_library(cryptui SHARED ${SOURCE}) - set_module_type(cryptui win32dll) - target_link_libraries(cryptui uuid wine) +add_delay_importlibs(cryptui urlmon wintrust) add_importlibs(cryptui user32 @@ -27,8 +26,6 @@ add_importlibs(cryptui crypt32 gdi32 advapi32 - urlmon - wintrust comctl32 comdlg32 msvcrt diff --git a/reactos/dll/win32/dbghelp/CMakeLists.txt b/reactos/dll/win32/dbghelp/CMakeLists.txt index f7f682a5891..3b40bf0af00 100644 --- a/reactos/dll/win32/dbghelp/CMakeLists.txt +++ b/reactos/dll/win32/dbghelp/CMakeLists.txt @@ -45,14 +45,10 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/dbghelp.def) add_library(dbghelp SHARED ${SOURCE}) - set_module_type(dbghelp win32dll) -target_link_libraries(dbghelp - wine - ${PSEH_LIB} - oldnames) - -add_importlibs(dbghelp psapi version msvcrt kernel32 ntdll) +target_link_libraries(dbghelp wine ${PSEH_LIB} oldnames) +add_delay_importlibs(dbghelp version) +add_importlibs(dbghelp psapi msvcrt kernel32 ntdll) add_pch(dbghelp dbghelp_private.h) add_importlib_target(dbghelp.spec) add_cd_file(TARGET dbghelp DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/gdiplus/CMakeLists.txt b/reactos/dll/win32/gdiplus/CMakeLists.txt index cf2e3742b0e..947475f124e 100644 --- a/reactos/dll/win32/gdiplus/CMakeLists.txt +++ b/reactos/dll/win32/gdiplus/CMakeLists.txt @@ -33,9 +33,9 @@ if(MSVC) endif() add_library(gdiplus SHARED ${SOURCE}) - set_module_type(gdiplus win32dll) target_link_libraries(gdiplus uuid wine) +add_delay_importlibs(gdiplus windowscodecs) add_importlibs(gdiplus msvcrt @@ -44,7 +44,6 @@ add_importlibs(gdiplus ole32 user32 gdi32 - windowscodecs kernel32 ntdll) diff --git a/reactos/dll/win32/hlink/CMakeLists.txt b/reactos/dll/win32/hlink/CMakeLists.txt index f054ab8c877..793a4ce4713 100644 --- a/reactos/dll/win32/hlink/CMakeLists.txt +++ b/reactos/dll/win32/hlink/CMakeLists.txt @@ -13,16 +13,14 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/hlink.def) add_library(hlink SHARED ${SOURCE}) - set_module_type(hlink win32dll) - target_link_libraries(hlink uuid wine) +add_delay_importlibs(hlink urlmon) add_importlibs(hlink shell32 ole32 advapi32 - urlmon msvcrt kernel32 ntdll) diff --git a/reactos/dll/win32/inetmib1/CMakeLists.txt b/reactos/dll/win32/inetmib1/CMakeLists.txt index 84b92fc5424..85ff339263b 100644 --- a/reactos/dll/win32/inetmib1/CMakeLists.txt +++ b/reactos/dll/win32/inetmib1/CMakeLists.txt @@ -10,14 +10,13 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/inetmib1.def) add_library(inetmib1 SHARED ${SOURCE}) - set_module_type(inetmib1 win32dll) target_link_libraries(inetmib1 wine) +add_delay_importlibs(inetmib1 iphlpapi) add_importlibs(inetmib1 msvcrt snmpapi - iphlpapi kernel32 ntdll) diff --git a/reactos/dll/win32/mlang/CMakeLists.txt b/reactos/dll/win32/mlang/CMakeLists.txt index d30cbcc24de..cdf641dae56 100644 --- a/reactos/dll/win32/mlang/CMakeLists.txt +++ b/reactos/dll/win32/mlang/CMakeLists.txt @@ -15,16 +15,15 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/mlang.def) add_library(mlang SHARED ${SOURCE}) - set_entrypoint(mlang 0) target_link_libraries(mlang uuid wine) +add_delay_importlibs(mlang oleaut32) add_importlibs(mlang ole32 user32 gdi32 advapi32 - oleaut32 kernel32 ntdll) diff --git a/reactos/dll/win32/mshtml/CMakeLists.txt b/reactos/dll/win32/mshtml/CMakeLists.txt index d91ec8a769f..755279ddb3f 100644 --- a/reactos/dll/win32/mshtml/CMakeLists.txt +++ b/reactos/dll/win32/mshtml/CMakeLists.txt @@ -78,14 +78,9 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/mshtml.def) add_library(mshtml SHARED ${SOURCE}) - set_module_type(mshtml win32dll) - -target_link_libraries(mshtml - uuid - wine - strmiids - oldnames) +target_link_libraries(mshtml uuid wine strmiids oldnames) +add_delay_importlibs(mshtml wininet) add_importlibs(mshtml urlmon @@ -95,7 +90,6 @@ add_importlibs(mshtml user32 gdi32 advapi32 - wininet msvcrt kernel32 ntdll) diff --git a/reactos/dll/win32/msi/CMakeLists.txt b/reactos/dll/win32/msi/CMakeLists.txt index a639493311e..73b510daeb5 100644 --- a/reactos/dll/win32/msi/CMakeLists.txt +++ b/reactos/dll/win32/msi/CMakeLists.txt @@ -69,18 +69,18 @@ endif() add_library(msi SHARED ${SOURCE}) -add_idl_Headers(msi_idlheader msiserver.idl) +add_idl_headers(msi_idlheader msiserver.idl) add_typelib(msi_tlb msiserver.idl) set_module_type(msi win32dll) target_link_libraries(msi uuid ${PSEH_LIB} wine) add_dependencies(msi msi_idlheader msi_tlb) +add_delay_importlibs(msi odbccp32) add_importlibs(msi advapi32 cabinet comctl32 gdi32 - odbccp32 ole32 oleaut32 shell32 diff --git a/reactos/dll/win32/oleaut32/CMakeLists.txt b/reactos/dll/win32/oleaut32/CMakeLists.txt index bc1c63005ef..30ed9c77add 100644 --- a/reactos/dll/win32/oleaut32/CMakeLists.txt +++ b/reactos/dll/win32/oleaut32/CMakeLists.txt @@ -54,7 +54,6 @@ if(MSVC) endif() add_library(oleaut32 SHARED ${SOURCE}) - set_module_type(oleaut32 win32dll) target_link_libraries(oleaut32 @@ -63,7 +62,7 @@ target_link_libraries(oleaut32 uuid ${PSEH_LIB}) -add_importlibs(oleaut32 windowscodecs ole32 rpcrt4 user32 gdi32 advapi32 comctl32 urlmon msvcrt kernel32 ntdll) - +add_delay_importlibs(oleaut32 comctl32 urlmon windowscodecs) +add_importlibs(oleaut32 ole32 rpcrt4 user32 gdi32 advapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET oleaut32 DESTINATION reactos/system32 FOR all) add_importlib_target(oleaut32.spec) diff --git a/reactos/dll/win32/rpcrt4/CMakeLists.txt b/reactos/dll/win32/rpcrt4/CMakeLists.txt index e9c1175fd44..46a2b70e57d 100644 --- a/reactos/dll/win32/rpcrt4/CMakeLists.txt +++ b/reactos/dll/win32/rpcrt4/CMakeLists.txt @@ -43,16 +43,10 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(rpcrt4.dll rpcrt4.spec) add_library(rpcrt4 SHARED ${SOURCE}) - set_module_type(rpcrt4 win32dll) +target_link_libraries(rpcrt4 wine uuid ${PSEH_LIB}) -target_link_libraries(rpcrt4 - wine - uuid - ${PSEH_LIB}) - -add_importlibs(rpcrt4 msvcrt user32 advapi32 secur32 iphlpapi ws2_32 kernel32 ntdll) -add_delay_importlibs(rpcrt4 wininet) - +add_delay_importlibs(rpcrt4 iphlpapi wininet secur32 user32) +add_importlibs(rpcrt4 msvcrt advapi32 ws2_32 kernel32 ntdll) add_cd_file(TARGET rpcrt4 DESTINATION reactos/system32 FOR all) add_importlib_target(rpcrt4.spec) diff --git a/reactos/dll/win32/setupapi/CMakeLists.txt b/reactos/dll/win32/setupapi/CMakeLists.txt index 65e772a09de..74d33c9b5b8 100644 --- a/reactos/dll/win32/setupapi/CMakeLists.txt +++ b/reactos/dll/win32/setupapi/CMakeLists.txt @@ -38,13 +38,9 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/pnp_c.c) add_library(setupapi SHARED ${SOURCE}) - set_module_type(setupapi win32dll UNICODE) - -target_link_libraries(setupapi - uuid - wine - ${PSEH_LIB}) +target_link_libraries(setupapi uuid wine ${PSEH_LIB}) +add_delay_importlibs(setupapi shell32) add_importlibs(setupapi msvcrt @@ -54,7 +50,6 @@ add_importlibs(setupapi user32 rpcrt4 version - shell32 kernel32 ntdll) diff --git a/reactos/dll/win32/shdocvw/CMakeLists.txt b/reactos/dll/win32/shdocvw/CMakeLists.txt index c4f7e01d50e..1ad12e9f24e 100644 --- a/reactos/dll/win32/shdocvw/CMakeLists.txt +++ b/reactos/dll/win32/shdocvw/CMakeLists.txt @@ -33,21 +33,17 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/shdocvw.def) add_library(shdocvw SHARED ${SOURCE}) - set_module_type(shdocvw win32dll) - target_link_libraries(shdocvw uuid wine) +add_delay_importlibs(shdocvw version ole32 oleaut32) add_importlibs(shdocvw comctl32 - ole32 - oleaut32 shlwapi shell32 user32 advapi32 gdi32 - version urlmon msvcrt kernel32 diff --git a/reactos/dll/win32/shell32/CMakeLists.txt b/reactos/dll/win32/shell32/CMakeLists.txt index fd63191566b..bf68b6baf74 100644 --- a/reactos/dll/win32/shell32/CMakeLists.txt +++ b/reactos/dll/win32/shell32/CMakeLists.txt @@ -73,13 +73,9 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/shell32.def) add_library(shell32 SHARED ${SOURCE}) - set_module_type(shell32 win32dll) - -target_link_libraries(shell32 - wine - uuid - recyclebin) +target_link_libraries(shell32 wine uuid recyclebin) +add_delay_importlibs(shell32 ole32 version) add_importlibs(shell32 advapi32 @@ -88,8 +84,6 @@ add_importlibs(shell32 comctl32 comdlg32 shlwapi - ole32 - version devmgr winspool winmm @@ -98,6 +92,5 @@ add_importlibs(shell32 ntdll) add_pch(shell32 precomp.h) - add_cd_file(TARGET shell32 DESTINATION reactos/system32 FOR all) add_importlib_target(shell32.spec) diff --git a/reactos/dll/win32/shlwapi/CMakeLists.txt b/reactos/dll/win32/shlwapi/CMakeLists.txt index bffd225a6e8..546cc06ceca 100644 --- a/reactos/dll/win32/shlwapi/CMakeLists.txt +++ b/reactos/dll/win32/shlwapi/CMakeLists.txt @@ -27,31 +27,9 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/shlwapi.def) add_library(shlwapi SHARED ${SOURCE}) - set_module_type(shlwapi win32dll) - target_link_libraries(shlwapi wine uuid) - -add_importlibs(shlwapi - user32 - gdi32 - advapi32 - oleaut32 - ole32 - comctl32 - comdlg32 - mpr - mlang - urlmon - winmm - version - shell32 - msvcrt - kernel32 - userenv - wininet - ntdll) - +add_delay_importlibs(shlwapi userenv oleaut32 ole32 comctl32 comdlg32 mpr mlang urlmon shell32 winmm version) +add_importlibs(shlwapi user32 gdi32 advapi32 msvcrt wininet kernel32 ntdll) add_cd_file(TARGET shlwapi DESTINATION reactos/system32 FOR all) - add_importlib_target(shlwapi.spec) diff --git a/reactos/dll/win32/user32/CMakeLists.txt b/reactos/dll/win32/user32/CMakeLists.txt index dbcbbc393bf..b1ace098fb5 100644 --- a/reactos/dll/win32/user32/CMakeLists.txt +++ b/reactos/dll/win32/user32/CMakeLists.txt @@ -1,5 +1,4 @@ - spec2def(user32.dll user32.spec) include_directories( @@ -65,7 +64,6 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/user32.def) add_library(user32 SHARED ${SOURCE}) - set_module_type(user32 win32dll UNICODE) target_link_libraries(user32 @@ -74,7 +72,8 @@ target_link_libraries(user32 win32ksys ${PSEH_LIB}) -add_importlibs(user32 gdi32 advapi32 imm32 msvcrt kernel32 ntdll) +add_delay_importlibs(user32 imm32) +add_importlibs(user32 gdi32 advapi32 msvcrt kernel32 ntdll) add_pch(user32 include/user32.h) add_cd_file(TARGET user32 DESTINATION reactos/system32 FOR all) add_importlib_target(user32.spec) diff --git a/reactos/dll/win32/uxtheme/CMakeLists.txt b/reactos/dll/win32/uxtheme/CMakeLists.txt index 30781aa28a4..8d7631fdbdb 100644 --- a/reactos/dll/win32/uxtheme/CMakeLists.txt +++ b/reactos/dll/win32/uxtheme/CMakeLists.txt @@ -20,12 +20,9 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/uxtheme.def) add_library(uxtheme SHARED ${SOURCE}) - set_module_type(uxtheme win32dll) - target_link_libraries(uxtheme wine) - -add_importlibs(uxtheme user32 advapi32 gdi32 msimg32 msvcrt kernel32 ntdll) - +add_delay_importlibs(uxtheme msimg32) +add_importlibs(uxtheme user32 advapi32 gdi32 msvcrt kernel32 ntdll) add_cd_file(TARGET uxtheme DESTINATION reactos/system32 FOR all) add_importlib_target(uxtheme.spec) diff --git a/reactos/dll/win32/winhttp/CMakeLists.txt b/reactos/dll/win32/winhttp/CMakeLists.txt index a5bff14ed9f..33777f232e5 100644 --- a/reactos/dll/win32/winhttp/CMakeLists.txt +++ b/reactos/dll/win32/winhttp/CMakeLists.txt @@ -18,6 +18,7 @@ add_library(winhttp SHARED ${SOURCE}) set_module_type(winhttp win32dll) target_link_libraries(winhttp wine) -add_importlibs(winhttp shlwapi wininet ws2_32 msvcrt crypt32 advapi32 kernel32 ntdll) +add_delay_importlibs(winhttp crypt32) +add_importlibs(winhttp shlwapi wininet ws2_32 msvcrt advapi32 kernel32 ntdll) add_importlib_target(winhttp.spec) add_cd_file(TARGET winhttp DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/wininet/CMakeLists.txt b/reactos/dll/win32/wininet/CMakeLists.txt index 0351ba69925..865ef7014a9 100644 --- a/reactos/dll/win32/wininet/CMakeLists.txt +++ b/reactos/dll/win32/wininet/CMakeLists.txt @@ -1,7 +1,8 @@ add_definitions( - -D__WINESRC__ -D_WINE - -Dclose=_close) + -D__WINESRC__ + -D_WINE + -Dclose=_close) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) @@ -28,10 +29,8 @@ list(APPEND SOURCE add_library(wininet SHARED ${SOURCE}) set_module_type(wininet win32dll) - target_link_libraries(wininet wine ${PSEH_LIB}) - -add_importlibs(wininet mpr shlwapi shell32 user32 advapi32 secur32 crypt32 ws2_32 msvcrt kernel32 ntdll) - +add_delay_importlibs(wininet secur32 crypt32) +add_importlibs(wininet mpr shlwapi shell32 user32 advapi32 ws2_32 msvcrt kernel32 ntdll) add_cd_file(TARGET wininet DESTINATION reactos/system32 FOR all) add_importlib_target(wininet.spec) diff --git a/reactos/dll/win32/wintrust/CMakeLists.txt b/reactos/dll/win32/wintrust/CMakeLists.txt index f4aebcd2b27..7fc3b99ce02 100644 --- a/reactos/dll/win32/wintrust/CMakeLists.txt +++ b/reactos/dll/win32/wintrust/CMakeLists.txt @@ -16,16 +16,9 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/wintrust.def) add_library(wintrust SHARED ${SOURCE}) - set_module_type(wintrust win32dll) - -target_link_libraries(wintrust - wine - ${PSEH_LIB}) - -add_importlibs(wintrust crypt32 cryptui user32 advapi32 imagehlp msvcrt kernel32 ntdll) - +target_link_libraries(wintrust wine ${PSEH_LIB}) +add_delay_importlibs(wintrust cryptui imagehlp) +add_importlibs(wintrust crypt32 user32 advapi32 msvcrt kernel32 ntdll) add_importlib_target(wintrust.spec) - add_cd_file(TARGET wintrust DESTINATION reactos/system32 FOR all) - diff --git a/reactos/dll/win32/ws2_32/CMakeLists.txt b/reactos/dll/win32/ws2_32/CMakeLists.txt index fdddb94076f..8b4ec94d44b 100644 --- a/reactos/dll/win32/ws2_32/CMakeLists.txt +++ b/reactos/dll/win32/ws2_32/CMakeLists.txt @@ -1,5 +1,4 @@ - add_definitions(-DLE) add_definitions(-DWINSOCK_API_LINKAGE=DECLSPEC_EXPORT) @@ -23,13 +22,10 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/ws2_32.def) add_library(ws2_32 SHARED ${SOURCE}) - set_module_type(ws2_32 win32dll UNICODE) - target_link_libraries(ws2_32 wine) - -add_importlibs(ws2_32 user32 advapi32 dnsapi ws2help msvcrt kernel32 ntdll) +add_delay_importlibs(ws2_32 user32) +add_importlibs(ws2_32 advapi32 dnsapi ws2help msvcrt kernel32 ntdll) add_pch(ws2_32 include/ws2_32.h) - add_cd_file(TARGET ws2_32 DESTINATION reactos/system32 FOR all) add_importlib_target(ws2_32.spec)