From 4e1f5725ff54cfc668de42db4ec126a33da4c327 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sat, 27 Nov 2010 01:16:42 +0000 Subject: [PATCH] - Fix more dlls. svn path=/branches/cmake-bringup/; revision=49810 --- dll/win32/crtdll/CMakeLists.txt | 2 +- dll/win32/cryptdll/CMakeLists.txt | 2 +- dll/win32/itircl/CMakeLists.txt | 2 +- dll/win32/localspl/CMakeLists.txt | 1 + dll/win32/localui/CMakeLists.txt | 2 +- dll/win32/lpk/CMakeLists.txt | 2 +- dll/win32/mapi32/CMakeLists.txt | 2 +- dll/win32/mciavi32/CMakeLists.txt | 2 +- dll/win32/mciqtz32/CMakeLists.txt | 2 +- dll/win32/modemui/CMakeLists.txt | 2 +- dll/win32/mpr/CMakeLists.txt | 2 +- dll/win32/mprapi/CMakeLists.txt | 2 +- dll/win32/msafd/CMakeLists.txt | 2 +- dll/win32/mscat32/CMakeLists.txt | 2 +- dll/win32/mscms/CMakeLists.txt | 2 +- dll/win32/mscoree/CMakeLists.txt | 2 +- dll/win32/msctf/CMakeLists.txt | 2 +- dll/win32/msftedit/CMakeLists.txt | 2 +- dll/win32/msgina/CMakeLists.txt | 2 +- dll/win32/mshtml/CMakeLists.txt | 2 +- dll/win32/msimg32/CMakeLists.txt | 2 +- dll/win32/msisip/CMakeLists.txt | 2 +- dll/win32/msisys.ocx/CMakeLists.txt | 2 +- dll/win32/msnet32/CMakeLists.txt | 2 +- dll/win32/mssign32/CMakeLists.txt | 2 +- dll/win32/mssip32/CMakeLists.txt | 2 +- dll/win32/msvidc32/CMakeLists.txt | 2 +- dll/win32/mswsock/CMakeLists.txt | 2 +- dll/win32/netapi32/CMakeLists.txt | 2 +- dll/win32/netcfgx/CMakeLists.txt | 2 +- dll/win32/netevent/CMakeLists.txt | 2 +- dll/win32/netid/CMakeLists.txt | 2 +- dll/win32/newdev/CMakeLists.txt | 2 +- dll/win32/ntlanman/CMakeLists.txt | 2 +- dll/win32/ntmarta/CMakeLists.txt | 1 + dll/win32/ntprint/CMakeLists.txt | 2 +- dll/win32/objsel/CMakeLists.txt | 1 + dll/win32/oledlg/CMakeLists.txt | 2 +- dll/win32/olethk32/CMakeLists.txt | 2 +- dll/win32/pidgen/CMakeLists.txt | 2 +- dll/win32/powrprof/CMakeLists.txt | 2 +- dll/win32/psapi/CMakeLists.txt | 2 +- dll/win32/query/CMakeLists.txt | 2 +- dll/win32/rasadhlp/CMakeLists.txt | 2 +- dll/win32/rasdlg/CMakeLists.txt | 2 +- dll/win32/rasman/CMakeLists.txt | 2 +- dll/win32/resutils/CMakeLists.txt | 2 +- dll/win32/riched32/CMakeLists.txt | 2 +- dll/win32/samlib/CMakeLists.txt | 2 +- dll/win32/sccbase/CMakeLists.txt | 2 +- dll/win32/schannel/CMakeLists.txt | 2 +- dll/win32/secur32/CMakeLists.txt | 2 +- dll/win32/sensapi/CMakeLists.txt | 2 +- dll/win32/serialui/CMakeLists.txt | 2 +- dll/win32/sfc/CMakeLists.txt | 4 +--- dll/win32/shdocvw/CMakeLists.txt | 1 + dll/win32/slbcsp/CMakeLists.txt | 2 +- dll/win32/sndblst/CMakeLists.txt | 2 +- dll/win32/snmpapi/CMakeLists.txt | 2 +- dll/win32/spoolss/CMakeLists.txt | 2 +- dll/win32/t2embed/CMakeLists.txt | 2 +- dll/win32/uext2/CMakeLists.txt | 2 +- dll/win32/url/CMakeLists.txt | 2 +- dll/win32/urlmon/CMakeLists.txt | 10 ++++++---- dll/win32/usp10/CMakeLists.txt | 2 +- dll/win32/uxtheme/CMakeLists.txt | 2 +- dll/win32/winspool/CMakeLists.txt | 2 +- dll/win32/winsta/CMakeLists.txt | 2 +- dll/win32/ws2_32/CMakeLists.txt | 2 +- dll/win32/wshirda/CMakeLists.txt | 2 +- dll/win32/wsock32/CMakeLists.txt | 2 +- dll/win32/wtsapi32/CMakeLists.txt | 2 +- 72 files changed, 77 insertions(+), 73 deletions(-) diff --git a/dll/win32/crtdll/CMakeLists.txt b/dll/win32/crtdll/CMakeLists.txt index 8658ece4d84..386413ef9ca 100644 --- a/dll/win32/crtdll/CMakeLists.txt +++ b/dll/win32/crtdll/CMakeLists.txt @@ -29,7 +29,7 @@ target_link_libraries(crtdll wine crt) -add_importlibs(crtdll msvcrt kernel32 ntdll) +add_importlibs(crtdll kernel32 ntdll) add_pch(crtdll ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) add_cab_target(crtdll 1) diff --git a/dll/win32/cryptdll/CMakeLists.txt b/dll/win32/cryptdll/CMakeLists.txt index 5fa1a4ffbfb..54a2b3449ba 100644 --- a/dll/win32/cryptdll/CMakeLists.txt +++ b/dll/win32/cryptdll/CMakeLists.txt @@ -16,6 +16,6 @@ target_link_libraries(cryptdll ${CMAKE_CURRENT_BINARY_DIR}/cryptdll.def wine) -add_importlibs(cryptdll kernel32 ntdll) +add_importlibs(cryptdll msvcrt kernel32 ntdll) add_cab_target(cryptdll 1) diff --git a/dll/win32/itircl/CMakeLists.txt b/dll/win32/itircl/CMakeLists.txt index 67f1202bf16..2511d2bd731 100644 --- a/dll/win32/itircl/CMakeLists.txt +++ b/dll/win32/itircl/CMakeLists.txt @@ -10,6 +10,6 @@ set_module_type(itircl win32dll) target_link_libraries(itircl wine) -add_importlibs(itircl kernel32 ntdll) +add_importlibs(itircl msvcrt kernel32 ntdll) add_dependencies(itircl psdk) add_cab_target(itircl 1) diff --git a/dll/win32/localspl/CMakeLists.txt b/dll/win32/localspl/CMakeLists.txt index 189d00dd811..2a883d9400e 100644 --- a/dll/win32/localspl/CMakeLists.txt +++ b/dll/win32/localspl/CMakeLists.txt @@ -22,6 +22,7 @@ add_importlibs(localspl spoolss user32 advapi32 + msvcrt kernel32 ntdll) diff --git a/dll/win32/localui/CMakeLists.txt b/dll/win32/localui/CMakeLists.txt index 44cf06f20f6..23d868ea238 100644 --- a/dll/win32/localui/CMakeLists.txt +++ b/dll/win32/localui/CMakeLists.txt @@ -17,6 +17,6 @@ target_link_libraries(localui uuid wine) -add_importlibs(localui winspool user32 kernel32 ntdll) +add_importlibs(localui winspool user32 msvcrt kernel32 ntdll) add_cab_target(localui 1) diff --git a/dll/win32/lpk/CMakeLists.txt b/dll/win32/lpk/CMakeLists.txt index d7cc9447ba3..df378251ed9 100644 --- a/dll/win32/lpk/CMakeLists.txt +++ b/dll/win32/lpk/CMakeLists.txt @@ -16,6 +16,6 @@ add_importlib_target(${CMAKE_CURRENT_BINARY_DIR}/lpk.def) set_module_type(lpk win32dll) -add_importlibs(lpk user32 usp10 kernel32 ntdll) +add_importlibs(lpk user32 usp10 msvcrt kernel32 ntdll) add_cab_target(lpk 1) diff --git a/dll/win32/mapi32/CMakeLists.txt b/dll/win32/mapi32/CMakeLists.txt index b14661f0e11..d96f690e272 100644 --- a/dll/win32/mapi32/CMakeLists.txt +++ b/dll/win32/mapi32/CMakeLists.txt @@ -19,6 +19,6 @@ target_link_libraries(mapi32 wine uuid) -add_importlibs(mapi32 shlwapi shell32 user32 advapi32 kernel32 ntdll) +add_importlibs(mapi32 shlwapi shell32 user32 advapi32 msvcrt kernel32 ntdll) add_cab_target(mapi32 1) diff --git a/dll/win32/mciavi32/CMakeLists.txt b/dll/win32/mciavi32/CMakeLists.txt index 46cfb30ee1d..835fa43a37b 100644 --- a/dll/win32/mciavi32/CMakeLists.txt +++ b/dll/win32/mciavi32/CMakeLists.txt @@ -18,6 +18,6 @@ set_module_type(mciavi32 win32dll) target_link_libraries(mciavi32 wine) -add_importlibs(mciavi32 msvfw32 winmm user32 gdi32 kernel32 ntdll) +add_importlibs(mciavi32 msvfw32 winmm user32 gdi32 msvcrt kernel32 ntdll) add_cab_target(mciavi32 1) diff --git a/dll/win32/mciqtz32/CMakeLists.txt b/dll/win32/mciqtz32/CMakeLists.txt index 6df194a895e..9ab03654a58 100644 --- a/dll/win32/mciqtz32/CMakeLists.txt +++ b/dll/win32/mciqtz32/CMakeLists.txt @@ -14,6 +14,6 @@ target_link_libraries(mciqtz32 wine strmiids) -add_importlibs(mciqtz32 winmm oleaut32 ole32 user32 gdi32 kernel32 ntdll) +add_importlibs(mciqtz32 winmm oleaut32 ole32 user32 gdi32 msvcrt kernel32 ntdll) add_cab_target(mciqtz32 1) diff --git a/dll/win32/modemui/CMakeLists.txt b/dll/win32/modemui/CMakeLists.txt index fffedb45a81..e39a88ad706 100644 --- a/dll/win32/modemui/CMakeLists.txt +++ b/dll/win32/modemui/CMakeLists.txt @@ -7,6 +7,6 @@ add_library(modemui SHARED modemui.c modemui.rc ${CMAKE_CURRENT_BINARY_DIR}/mode set_module_type(modemui win32dll) -add_importlibs(modemui kernel32) +add_importlibs(modemui msvcrt kernel32) add_cab_target(modemui 1) diff --git a/dll/win32/mpr/CMakeLists.txt b/dll/win32/mpr/CMakeLists.txt index 780377a56d2..4f381cdeb9b 100644 --- a/dll/win32/mpr/CMakeLists.txt +++ b/dll/win32/mpr/CMakeLists.txt @@ -20,7 +20,7 @@ set_module_type(mpr win32dll) target_link_libraries(mpr wine) -add_importlibs(mpr advapi32 user32 kernel32 ntdll) +add_importlibs(mpr advapi32 user32 msvcrt kernel32 ntdll) add_cab_target(mpr 1) add_importlib_target(mpr.spec) diff --git a/dll/win32/mprapi/CMakeLists.txt b/dll/win32/mprapi/CMakeLists.txt index 0c879d1d4ad..f54f3c01898 100644 --- a/dll/win32/mprapi/CMakeLists.txt +++ b/dll/win32/mprapi/CMakeLists.txt @@ -10,6 +10,6 @@ set_module_type(mprapi win32dll) target_link_libraries(mprapi wine) -add_importlibs(mprapi kernel32 ntdll) +add_importlibs(mprapi msvcrt kernel32 ntdll) add_cab_target(mprapi 1) diff --git a/dll/win32/msafd/CMakeLists.txt b/dll/win32/msafd/CMakeLists.txt index f41b48e9e3b..74eba1121c8 100644 --- a/dll/win32/msafd/CMakeLists.txt +++ b/dll/win32/msafd/CMakeLists.txt @@ -26,6 +26,6 @@ set_module_type(msafd win32dll) add_pch(msafd ${CMAKE_CURRENT_SOURCE_DIR}/msafd.h ${SOURCE}) -add_importlibs(msafd advapi32 kernel32 ntdll) +add_importlibs(msafd advapi32 msvcrt kernel32 ntdll) add_cab_target(msafd 1) diff --git a/dll/win32/mscat32/CMakeLists.txt b/dll/win32/mscat32/CMakeLists.txt index 9138cfd038a..458fffcc8c7 100644 --- a/dll/win32/mscat32/CMakeLists.txt +++ b/dll/win32/mscat32/CMakeLists.txt @@ -11,6 +11,6 @@ set_module_type(mscat32 win32dll) target_link_libraries(mscat32 wine) -add_importlibs(mscat32 wintrust kernel32 ntdll) +add_importlibs(mscat32 wintrust msvcrt kernel32 ntdll) add_cab_target(mscat32 1) diff --git a/dll/win32/mscms/CMakeLists.txt b/dll/win32/mscms/CMakeLists.txt index d68dc907ed2..dc966110238 100644 --- a/dll/win32/mscms/CMakeLists.txt +++ b/dll/win32/mscms/CMakeLists.txt @@ -18,6 +18,6 @@ set_module_type(mscms win32dll) target_link_libraries(mscms wine) -add_importlibs(mscms kernel32 ntdll) +add_importlibs(mscms msvcrt kernel32 ntdll) add_cab_target(mscms 1) diff --git a/dll/win32/mscoree/CMakeLists.txt b/dll/win32/mscoree/CMakeLists.txt index 8a2d707772e..96678d09cdc 100644 --- a/dll/win32/mscoree/CMakeLists.txt +++ b/dll/win32/mscoree/CMakeLists.txt @@ -12,6 +12,6 @@ target_link_libraries(mscoree wine uuid) -add_importlibs(mscoree advapi32 shell32 kernel32 ntdll) +add_importlibs(mscoree advapi32 shell32 msvcrt kernel32 ntdll) add_cab_target(mscoree 1) diff --git a/dll/win32/msctf/CMakeLists.txt b/dll/win32/msctf/CMakeLists.txt index d02b2700663..c8131004867 100644 --- a/dll/win32/msctf/CMakeLists.txt +++ b/dll/win32/msctf/CMakeLists.txt @@ -28,6 +28,6 @@ target_link_libraries(msctf uuid wine) -add_importlibs(msctf ole32 oleaut32 user32 advapi32 kernel32 ntdll) +add_importlibs(msctf ole32 oleaut32 user32 advapi32 msvcrt kernel32 ntdll) add_cab_target(msctf 1) diff --git a/dll/win32/msftedit/CMakeLists.txt b/dll/win32/msftedit/CMakeLists.txt index 2d2522844ea..6929d3f0e48 100644 --- a/dll/win32/msftedit/CMakeLists.txt +++ b/dll/win32/msftedit/CMakeLists.txt @@ -15,6 +15,6 @@ target_link_libraries(msftedit uuid wine) -add_importlibs(msftedit riched20 kernel32 ntdll) +add_importlibs(msftedit riched20 msvcrt kernel32 ntdll) add_cab_target(msftedit 1) diff --git a/dll/win32/msgina/CMakeLists.txt b/dll/win32/msgina/CMakeLists.txt index 21b55769646..45718063aa1 100644 --- a/dll/win32/msgina/CMakeLists.txt +++ b/dll/win32/msgina/CMakeLists.txt @@ -16,6 +16,6 @@ set_module_type(msgina win32dll) target_link_libraries(msgina wine) -add_importlibs(msgina advapi32 user32 gdi32 userenv kernel32 ntdll) +add_importlibs(msgina advapi32 user32 gdi32 userenv msvcrt kernel32 ntdll) add_cab_target(msgina 1) diff --git a/dll/win32/mshtml/CMakeLists.txt b/dll/win32/mshtml/CMakeLists.txt index 72bb2e4fedd..279abb281ad 100644 --- a/dll/win32/mshtml/CMakeLists.txt +++ b/dll/win32/mshtml/CMakeLists.txt @@ -87,7 +87,6 @@ target_link_libraries(mshtml oldnames) add_importlibs(mshtml -# msvcrt urlmon shlwapi ole32 @@ -96,6 +95,7 @@ add_importlibs(mshtml gdi32 advapi32 wininet + msvcrt kernel32 ntdll) diff --git a/dll/win32/msimg32/CMakeLists.txt b/dll/win32/msimg32/CMakeLists.txt index 3908e1fe85c..46838ae8b41 100644 --- a/dll/win32/msimg32/CMakeLists.txt +++ b/dll/win32/msimg32/CMakeLists.txt @@ -12,7 +12,7 @@ set_module_type(msimg32 win32dll) target_link_libraries(msimg32 wine) -add_importlibs(msimg32 gdi32 kernel32 ntdll) +add_importlibs(msimg32 gdi32 msvcrt kernel32 ntdll) add_cab_target(msimg32 1) add_importlib_target(msimg32.spec) diff --git a/dll/win32/msisip/CMakeLists.txt b/dll/win32/msisip/CMakeLists.txt index 4bdaf615d1c..f61e7ed9b90 100644 --- a/dll/win32/msisip/CMakeLists.txt +++ b/dll/win32/msisip/CMakeLists.txt @@ -10,6 +10,6 @@ set_module_type(msisip win32dll) target_link_libraries(msisip wine) -add_importlibs(msisip crypt32 ole32 kernel32 ntdll) +add_importlibs(msisip crypt32 ole32 msvcrt kernel32 ntdll) add_cab_target(msisip 1) diff --git a/dll/win32/msisys.ocx/CMakeLists.txt b/dll/win32/msisys.ocx/CMakeLists.txt index bd50a76e308..b2dce6cbfb5 100644 --- a/dll/win32/msisys.ocx/CMakeLists.txt +++ b/dll/win32/msisys.ocx/CMakeLists.txt @@ -14,6 +14,6 @@ target_link_libraries(msisys uuid wine) -add_importlibs(msisys kernel32 ntdll) +add_importlibs(msisys msvcrt kernel32 ntdll) add_cab_target(msisys 1) \ No newline at end of file diff --git a/dll/win32/msnet32/CMakeLists.txt b/dll/win32/msnet32/CMakeLists.txt index da4939423fe..49a525471d1 100644 --- a/dll/win32/msnet32/CMakeLists.txt +++ b/dll/win32/msnet32/CMakeLists.txt @@ -10,6 +10,6 @@ set_module_type(msnet32 win32dll) target_link_libraries(msnet32 wine) -add_importlibs(msnet32 kernel32 ntdll) +add_importlibs(msnet32 msvcrt kernel32 ntdll) add_cab_target(msnet32 1) diff --git a/dll/win32/mssign32/CMakeLists.txt b/dll/win32/mssign32/CMakeLists.txt index 687397e63e9..2667dcde30f 100644 --- a/dll/win32/mssign32/CMakeLists.txt +++ b/dll/win32/mssign32/CMakeLists.txt @@ -10,6 +10,6 @@ set_module_type(mssign32 win32dll) target_link_libraries(mssign32 wine) -add_importlibs(mssign32 kernel32 ntdll) +add_importlibs(mssign32 msvcrt kernel32 ntdll) add_cab_target(mssign32 1) diff --git a/dll/win32/mssip32/CMakeLists.txt b/dll/win32/mssip32/CMakeLists.txt index 972ab84f34c..ae721004843 100644 --- a/dll/win32/mssip32/CMakeLists.txt +++ b/dll/win32/mssip32/CMakeLists.txt @@ -10,6 +10,6 @@ set_module_type(mssip32 win32dll) target_link_libraries(mssip32 wine) -add_importlibs(mssip32 kernel32 ntdll) +add_importlibs(mssip32 msvcrt kernel32 ntdll) add_cab_target(mssip32 1) diff --git a/dll/win32/msvidc32/CMakeLists.txt b/dll/win32/msvidc32/CMakeLists.txt index 3432c8e8443..6ed9db50164 100644 --- a/dll/win32/msvidc32/CMakeLists.txt +++ b/dll/win32/msvidc32/CMakeLists.txt @@ -15,6 +15,6 @@ set_module_type(msvidc32 win32dll) target_link_libraries(msvidc32 wine) -add_importlibs(msvidc32 user32 kernel32 ntdll) +add_importlibs(msvidc32 user32 msvcrt kernel32 ntdll) add_cab_target(msvidc32 1) diff --git a/dll/win32/mswsock/CMakeLists.txt b/dll/win32/mswsock/CMakeLists.txt index b34cfcece31..cfce84a79ec 100644 --- a/dll/win32/mswsock/CMakeLists.txt +++ b/dll/win32/mswsock/CMakeLists.txt @@ -18,6 +18,6 @@ endif() set_module_type(mswsock win32dll) -add_importlibs(mswsock ws2_32 kernel32) +add_importlibs(mswsock ws2_32 msvcrt kernel32) add_cab_target(mswsock 1) diff --git a/dll/win32/netapi32/CMakeLists.txt b/dll/win32/netapi32/CMakeLists.txt index 4319bec933c..2a31df9fa29 100644 --- a/dll/win32/netapi32/CMakeLists.txt +++ b/dll/win32/netapi32/CMakeLists.txt @@ -23,7 +23,7 @@ set_module_type(netapi32 win32dll) target_link_libraries(netapi32 wine) -add_importlibs(netapi32 iphlpapi ws2_32 advapi32 kernel32 ntdll) +add_importlibs(netapi32 iphlpapi ws2_32 advapi32 msvcrt kernel32 ntdll) add_cab_target(netapi32 1) add_importlib_target(netapi32.spec) diff --git a/dll/win32/netcfgx/CMakeLists.txt b/dll/win32/netcfgx/CMakeLists.txt index 2edadc87e24..0271a9bc003 100644 --- a/dll/win32/netcfgx/CMakeLists.txt +++ b/dll/win32/netcfgx/CMakeLists.txt @@ -19,6 +19,6 @@ target_link_libraries(netcfgx uuid wine) -add_importlibs(netcfgx rpcrt4 setupapi advapi32 iphlpapi ole32 user32 comctl32 ws2_32 kernel32 ntdll) +add_importlibs(netcfgx rpcrt4 setupapi advapi32 iphlpapi ole32 user32 comctl32 ws2_32 msvcrt kernel32 ntdll) add_cab_target(netcfgx 1) diff --git a/dll/win32/netevent/CMakeLists.txt b/dll/win32/netevent/CMakeLists.txt index e3b4cb40012..1ea76ddc9c1 100644 --- a/dll/win32/netevent/CMakeLists.txt +++ b/dll/win32/netevent/CMakeLists.txt @@ -9,7 +9,7 @@ add_library(netevent SHARED netevent.c netevt.rc ${CMAKE_CURRENT_BINARY_DIR}/net set_module_type(netevent win32dll) -add_importlibs(netevent kernel32) +add_importlibs(netevent msvcrt kernel32) add_dependencies(netevent neteventmsg) add_cab_target(netevent 1) diff --git a/dll/win32/netid/CMakeLists.txt b/dll/win32/netid/CMakeLists.txt index 228648e0b28..7bce286ced5 100644 --- a/dll/win32/netid/CMakeLists.txt +++ b/dll/win32/netid/CMakeLists.txt @@ -7,6 +7,6 @@ endif() set_module_type(netid win32dll) -add_importlibs(netid user32 gdi32 comctl32 advapi32 netapi32 kernel32 ntdll) +add_importlibs(netid user32 gdi32 comctl32 advapi32 netapi32 msvcrt kernel32 ntdll) add_cab_target(netid 1) diff --git a/dll/win32/newdev/CMakeLists.txt b/dll/win32/newdev/CMakeLists.txt index 9b4695b1737..eab9c8a9a7b 100644 --- a/dll/win32/newdev/CMakeLists.txt +++ b/dll/win32/newdev/CMakeLists.txt @@ -14,7 +14,7 @@ set_module_type(newdev win32dll) target_link_libraries(newdev wine) -add_importlibs(newdev gdi32 comctl32 setupapi advapi32 user32 shell32 kernel32 ntdll) +add_importlibs(newdev gdi32 comctl32 setupapi advapi32 user32 shell32 msvcrt kernel32 ntdll) add_cab_target(newdev 1) add_importlib_target(newdev.spec) diff --git a/dll/win32/ntlanman/CMakeLists.txt b/dll/win32/ntlanman/CMakeLists.txt index a007bcffb16..95d8365131b 100644 --- a/dll/win32/ntlanman/CMakeLists.txt +++ b/dll/win32/ntlanman/CMakeLists.txt @@ -9,6 +9,6 @@ set_module_type(ntlanman win32dll) target_link_libraries(ntlanman wine) -add_importlibs(ntlanman netapi32 kernel32 ntdll) +add_importlibs(ntlanman netapi32 msvcrt kernel32 ntdll) add_cab_target(ntlanman 1) diff --git a/dll/win32/ntmarta/CMakeLists.txt b/dll/win32/ntmarta/CMakeLists.txt index 19b0b84341e..247afdfa5a3 100644 --- a/dll/win32/ntmarta/CMakeLists.txt +++ b/dll/win32/ntmarta/CMakeLists.txt @@ -17,6 +17,7 @@ set_module_type(ntmarta win32dll) add_importlibs(ntmarta user32 advapi32 + msvcrt kernel32 ntdll) diff --git a/dll/win32/ntprint/CMakeLists.txt b/dll/win32/ntprint/CMakeLists.txt index ab2ac2fd76a..e11a5ca02a5 100644 --- a/dll/win32/ntprint/CMakeLists.txt +++ b/dll/win32/ntprint/CMakeLists.txt @@ -10,6 +10,6 @@ set_module_type(ntprint win32dll) target_link_libraries(ntprint wine) -add_importlibs(ntprint winspool kernel32 ntdll) +add_importlibs(ntprint winspool msvcrt kernel32 ntdll) add_dependencies(ntprint psdk) add_cab_target(ntprint 1) diff --git a/dll/win32/objsel/CMakeLists.txt b/dll/win32/objsel/CMakeLists.txt index 37ba2cdbc3e..b2ca780249a 100644 --- a/dll/win32/objsel/CMakeLists.txt +++ b/dll/win32/objsel/CMakeLists.txt @@ -27,6 +27,7 @@ add_importlibs(objsel ole32 user32 advapi32 + msvcrt kernel32 ntdll) diff --git a/dll/win32/oledlg/CMakeLists.txt b/dll/win32/oledlg/CMakeLists.txt index 7d2f911c1b2..297a5220a0f 100644 --- a/dll/win32/oledlg/CMakeLists.txt +++ b/dll/win32/oledlg/CMakeLists.txt @@ -17,6 +17,6 @@ set_module_type(oledlg win32dll) target_link_libraries(oledlg wine) -add_importlibs(oledlg ole32 comdlg32 user32 advapi32 kernel32 ntdll) +add_importlibs(oledlg ole32 comdlg32 user32 advapi32 msvcrt kernel32 ntdll) add_cab_target(oledlg 1) diff --git a/dll/win32/olethk32/CMakeLists.txt b/dll/win32/olethk32/CMakeLists.txt index 4c60f01c16b..2f0c2dd7419 100644 --- a/dll/win32/olethk32/CMakeLists.txt +++ b/dll/win32/olethk32/CMakeLists.txt @@ -10,6 +10,6 @@ set_module_type(olethk32 win32dll) target_link_libraries(olethk32 wine) -add_importlibs(olethk32 kernel32 ntdll) +add_importlibs(olethk32 msvcrt kernel32 ntdll) add_dependencies(olethk32 psdk) add_cab_target(olethk32 1) diff --git a/dll/win32/pidgen/CMakeLists.txt b/dll/win32/pidgen/CMakeLists.txt index 24a4745003a..030d722eb93 100644 --- a/dll/win32/pidgen/CMakeLists.txt +++ b/dll/win32/pidgen/CMakeLists.txt @@ -10,6 +10,6 @@ set_module_type(pidgen win32dll) target_link_libraries(pidgen wine) -add_importlibs(pidgen kernel32 ntdll) +add_importlibs(pidgen msvcrt kernel32 ntdll) add_cab_target(pidgen 1) diff --git a/dll/win32/powrprof/CMakeLists.txt b/dll/win32/powrprof/CMakeLists.txt index 67a06197aaa..024099adfce 100644 --- a/dll/win32/powrprof/CMakeLists.txt +++ b/dll/win32/powrprof/CMakeLists.txt @@ -12,7 +12,7 @@ set_module_type(powrprof win32dll) target_link_libraries(powrprof wine) -add_importlibs(powrprof advapi32 user32 comctl32 kernel32 ntdll) +add_importlibs(powrprof advapi32 user32 comctl32 msvcrt kernel32 ntdll) add_cab_target(powrprof 1) add_importlib_target(powrprof.spec) diff --git a/dll/win32/psapi/CMakeLists.txt b/dll/win32/psapi/CMakeLists.txt index 104802c4b3d..85d1e458fe4 100644 --- a/dll/win32/psapi/CMakeLists.txt +++ b/dll/win32/psapi/CMakeLists.txt @@ -19,7 +19,7 @@ target_link_libraries(psapi epsapi ${PSEH_LIB}) -add_importlibs(psapi kernel32 ntdll) +add_importlibs(psapi msvcrt kernel32 ntdll) add_pch(psapi ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) add_cab_target(psapi 1) diff --git a/dll/win32/query/CMakeLists.txt b/dll/win32/query/CMakeLists.txt index 184e8c698c8..e8c96f20874 100644 --- a/dll/win32/query/CMakeLists.txt +++ b/dll/win32/query/CMakeLists.txt @@ -12,6 +12,6 @@ target_link_libraries(query wine uuid) -add_importlibs(query kernel32 ntdll) +add_importlibs(query msvcrt kernel32 ntdll) add_cab_target(query 1) diff --git a/dll/win32/rasadhlp/CMakeLists.txt b/dll/win32/rasadhlp/CMakeLists.txt index 46cfaddfec0..406db935a08 100644 --- a/dll/win32/rasadhlp/CMakeLists.txt +++ b/dll/win32/rasadhlp/CMakeLists.txt @@ -11,6 +11,6 @@ add_library(rasadhlp SHARED set_module_type(rasadhlp win32dll) -add_importlibs(rasadhlp ws2_32 kernel32 ntdll) +add_importlibs(rasadhlp ws2_32 msvcrt kernel32 ntdll) add_cab_target(rasadhlp 1) diff --git a/dll/win32/rasdlg/CMakeLists.txt b/dll/win32/rasdlg/CMakeLists.txt index 95b5c2cb60b..f6a93cda971 100644 --- a/dll/win32/rasdlg/CMakeLists.txt +++ b/dll/win32/rasdlg/CMakeLists.txt @@ -9,6 +9,6 @@ target_link_libraries(rasdlg wine uuid) -add_importlibs(rasdlg kernel32 ntdll) +add_importlibs(rasdlg msvcrt kernel32 ntdll) add_cab_target(rasdlg 1) diff --git a/dll/win32/rasman/CMakeLists.txt b/dll/win32/rasman/CMakeLists.txt index af3aa63937a..436357d7b81 100644 --- a/dll/win32/rasman/CMakeLists.txt +++ b/dll/win32/rasman/CMakeLists.txt @@ -9,6 +9,6 @@ target_link_libraries(rasman wine uuid) -add_importlibs(rasman kernel32 ntdll) +add_importlibs(rasman msvcrt kernel32 ntdll) add_cab_target(rasman 1) diff --git a/dll/win32/resutils/CMakeLists.txt b/dll/win32/resutils/CMakeLists.txt index 82c32ceb471..0cd9e9edccd 100644 --- a/dll/win32/resutils/CMakeLists.txt +++ b/dll/win32/resutils/CMakeLists.txt @@ -10,6 +10,6 @@ set_module_type(resutils win32dll) target_link_libraries(resutils wine) -add_importlibs(resutils kernel32 ntdll) +add_importlibs(resutils msvcrt kernel32 ntdll) add_cab_target(resutils 1) diff --git a/dll/win32/riched32/CMakeLists.txt b/dll/win32/riched32/CMakeLists.txt index b889c9d7785..0c8cc157bc9 100644 --- a/dll/win32/riched32/CMakeLists.txt +++ b/dll/win32/riched32/CMakeLists.txt @@ -12,6 +12,6 @@ set_module_type(riched32 win32dll) target_link_libraries(riched32 wine) -add_importlibs(riched32 riched20 user32 kernel32 ntdll) +add_importlibs(riched32 riched20 user32 msvcrt kernel32 ntdll) add_cab_target(riched32 1) diff --git a/dll/win32/samlib/CMakeLists.txt b/dll/win32/samlib/CMakeLists.txt index 49c6a2c0a2b..fa95275af17 100644 --- a/dll/win32/samlib/CMakeLists.txt +++ b/dll/win32/samlib/CMakeLists.txt @@ -8,7 +8,7 @@ add_library(samlib SHARED dllmain.c samlib.c samlib.rc ${CMAKE_CURRENT_BINARY_DI set_module_type(samlib win32dll) -add_importlibs(samlib advapi32 kernel32 ntdll) +add_importlibs(samlib advapi32 msvcrt kernel32 ntdll) add_cab_target(samlib 1) add_importlib_target(samlib.spec) diff --git a/dll/win32/sccbase/CMakeLists.txt b/dll/win32/sccbase/CMakeLists.txt index 89d48ef357e..5280ae1f5c1 100644 --- a/dll/win32/sccbase/CMakeLists.txt +++ b/dll/win32/sccbase/CMakeLists.txt @@ -10,6 +10,6 @@ set_module_type(sccbase win32dll) target_link_libraries(sccbase wine) -add_importlibs(sccbase kernel32 ntdll) +add_importlibs(sccbase msvcrt kernel32 ntdll) add_cab_target(sccbase 1) diff --git a/dll/win32/schannel/CMakeLists.txt b/dll/win32/schannel/CMakeLists.txt index 37968b9f122..5895686bf43 100644 --- a/dll/win32/schannel/CMakeLists.txt +++ b/dll/win32/schannel/CMakeLists.txt @@ -15,6 +15,6 @@ set_module_type(schannel win32dll) target_link_libraries(schannel wine) -add_importlibs(schannel secur32 kernel32 ntdll) +add_importlibs(schannel secur32 msvcrt kernel32 ntdll) add_cab_target(schannel 1) diff --git a/dll/win32/secur32/CMakeLists.txt b/dll/win32/secur32/CMakeLists.txt index a45559f9eab..2e3811dfcbd 100644 --- a/dll/win32/secur32/CMakeLists.txt +++ b/dll/win32/secur32/CMakeLists.txt @@ -20,7 +20,7 @@ set_module_type(secur32 win32dll) target_link_libraries(secur32 lsalib) -add_importlibs(secur32 advapi32 kernel32 ntdll) +add_importlibs(secur32 advapi32 msvcrt kernel32 ntdll) add_pch(secur32 ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) add_cab_target(secur32 1) diff --git a/dll/win32/sensapi/CMakeLists.txt b/dll/win32/sensapi/CMakeLists.txt index 49f7bd7975f..6f330ec8067 100644 --- a/dll/win32/sensapi/CMakeLists.txt +++ b/dll/win32/sensapi/CMakeLists.txt @@ -12,6 +12,6 @@ set_module_type(sensapi win32dll) target_link_libraries(sensapi wine) -add_importlibs(sensapi kernel32 ntdll) +add_importlibs(sensapi msvcrt kernel32 ntdll) add_cab_target(sensapi 1) diff --git a/dll/win32/serialui/CMakeLists.txt b/dll/win32/serialui/CMakeLists.txt index f6132c38f32..625933c7613 100644 --- a/dll/win32/serialui/CMakeLists.txt +++ b/dll/win32/serialui/CMakeLists.txt @@ -9,6 +9,6 @@ endif() set_module_type(serialui win32dll) -add_importlibs(serialui user32 shlwapi kernel32) +add_importlibs(serialui user32 shlwapi msvcrt kernel32) add_cab_target(serialui 1) diff --git a/dll/win32/sfc/CMakeLists.txt b/dll/win32/sfc/CMakeLists.txt index 26c0dbcad99..152e9782dfd 100644 --- a/dll/win32/sfc/CMakeLists.txt +++ b/dll/win32/sfc/CMakeLists.txt @@ -11,9 +11,7 @@ add_library(sfc SHARED set_module_type(sfc win32dll) - - -add_importlibs(sfc kernel32) +add_importlibs(sfc msvcrt kernel32) add_pch(sfc ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) add_cab_target(sfc 1) diff --git a/dll/win32/shdocvw/CMakeLists.txt b/dll/win32/shdocvw/CMakeLists.txt index b33c211e67c..5f99988ad6f 100644 --- a/dll/win32/shdocvw/CMakeLists.txt +++ b/dll/win32/shdocvw/CMakeLists.txt @@ -47,6 +47,7 @@ add_importlibs(shdocvw gdi32 version urlmon + msvcrt kernel32 ntdll) diff --git a/dll/win32/slbcsp/CMakeLists.txt b/dll/win32/slbcsp/CMakeLists.txt index cd1492a856f..24a8b9dc066 100644 --- a/dll/win32/slbcsp/CMakeLists.txt +++ b/dll/win32/slbcsp/CMakeLists.txt @@ -10,6 +10,6 @@ set_module_type(slbcsp win32dll) target_link_libraries(slbcsp wine) -add_importlibs(slbcsp kernel32 ntdll) +add_importlibs(slbcsp msvcrt kernel32 ntdll) add_cab_target(slbcsp 1) diff --git a/dll/win32/sndblst/CMakeLists.txt b/dll/win32/sndblst/CMakeLists.txt index 43b54508a70..cbe93322650 100644 --- a/dll/win32/sndblst/CMakeLists.txt +++ b/dll/win32/sndblst/CMakeLists.txt @@ -16,6 +16,6 @@ target_link_libraries(sndblst mment4 mmebuddy) -add_importlibs(sndblst user32 winmm advapi32 kernel32 ntdll) +add_importlibs(sndblst user32 winmm advapi32 msvcrt kernel32 ntdll) add_cab_target(sndblst 1) diff --git a/dll/win32/snmpapi/CMakeLists.txt b/dll/win32/snmpapi/CMakeLists.txt index 105992a8192..1889adb9c9d 100644 --- a/dll/win32/snmpapi/CMakeLists.txt +++ b/dll/win32/snmpapi/CMakeLists.txt @@ -13,7 +13,7 @@ set_module_type(snmpapi win32dll) target_link_libraries(snmpapi wine) -add_importlibs(snmpapi kernel32 ntdll) +add_importlibs(snmpapi msvcrt kernel32 ntdll) add_cab_target(snmpapi 1) add_importlib_target(snmpapi.spec) diff --git a/dll/win32/spoolss/CMakeLists.txt b/dll/win32/spoolss/CMakeLists.txt index a138f980650..dc6a066c2b0 100644 --- a/dll/win32/spoolss/CMakeLists.txt +++ b/dll/win32/spoolss/CMakeLists.txt @@ -10,6 +10,6 @@ set_module_type(spoolss win32dll) target_link_libraries(spoolss wine) -add_importlibs(spoolss winspool kernel32 ntdll) +add_importlibs(spoolss winspool msvcrt kernel32 ntdll) add_cab_target(spoolss 1) diff --git a/dll/win32/t2embed/CMakeLists.txt b/dll/win32/t2embed/CMakeLists.txt index 53a8e50a9e6..66691bf5f34 100644 --- a/dll/win32/t2embed/CMakeLists.txt +++ b/dll/win32/t2embed/CMakeLists.txt @@ -11,7 +11,7 @@ set_module_type(t2embed win32dll) target_link_libraries(t2embed wine) -add_importlibs(t2embed gdi32 user32 advapi32 version kernel32 ntdll) +add_importlibs(t2embed gdi32 user32 advapi32 version msvcrt kernel32 ntdll) add_cab_target(t2embed 1) diff --git a/dll/win32/uext2/CMakeLists.txt b/dll/win32/uext2/CMakeLists.txt index 4ddf3788249..890257f8021 100644 --- a/dll/win32/uext2/CMakeLists.txt +++ b/dll/win32/uext2/CMakeLists.txt @@ -9,6 +9,6 @@ set_module_type(uext2 win32dll) target_link_libraries(uext2 ext2lib) -add_importlibs(uext2 kernel32 ntdll) +add_importlibs(uext2 msvcrt kernel32 ntdll) add_cab_target(uext2 1) diff --git a/dll/win32/url/CMakeLists.txt b/dll/win32/url/CMakeLists.txt index ef3111b75e6..76c2ad77848 100644 --- a/dll/win32/url/CMakeLists.txt +++ b/dll/win32/url/CMakeLists.txt @@ -12,6 +12,6 @@ set_module_type(url win32dll) target_link_libraries(url wine) -add_importlibs(url shell32 shlwapi kernel32 ntdll) +add_importlibs(url shell32 shlwapi msvcrt kernel32 ntdll) add_cab_target(url 1) diff --git a/dll/win32/urlmon/CMakeLists.txt b/dll/win32/urlmon/CMakeLists.txt index 3f1a541db89..9ee8f0de80c 100644 --- a/dll/win32/urlmon/CMakeLists.txt +++ b/dll/win32/urlmon/CMakeLists.txt @@ -51,14 +51,16 @@ add_importlibs(urlmon wininet user32 advapi32 + msvcrt kernel32 ntdll) -add_definitions(-DENTRY_PREFIX=URLMON_) -add_definitions(-DPROXY_DELEGATION) -add_definitions(-DREGISTER_PROXY_DLL) -add_definitions(-D_URLMON_) +add_definitions( + -DENTRY_PREFIX=URLMON_ + -DPROXY_DELEGATION + -DREGISTER_PROXY_DLL + -D_URLMON_) # FIXME : this should be quotes enclosed add_definitions(-DPROXY_CLSID_IS={0x79EAC9F1,0xBAF9,0x11CE,{0x8C,0x82,0x00,0xAA,0x00,0x4B,0xA9,0x0B}}) diff --git a/dll/win32/usp10/CMakeLists.txt b/dll/win32/usp10/CMakeLists.txt index d6cea792044..c49b14e0929 100644 --- a/dll/win32/usp10/CMakeLists.txt +++ b/dll/win32/usp10/CMakeLists.txt @@ -16,6 +16,6 @@ set_module_type(usp10 win32dll) target_link_libraries(usp10 wine) -add_importlibs(usp10 gdi32 kernel32 ntdll) +add_importlibs(usp10 gdi32 msvcrt kernel32 ntdll) add_cab_target(usp10 1) diff --git a/dll/win32/uxtheme/CMakeLists.txt b/dll/win32/uxtheme/CMakeLists.txt index d1b140acce6..41c06f9813e 100644 --- a/dll/win32/uxtheme/CMakeLists.txt +++ b/dll/win32/uxtheme/CMakeLists.txt @@ -21,7 +21,7 @@ set_module_type(uxtheme win32dll) target_link_libraries(uxtheme wine) -add_importlibs(uxtheme user32 advapi32 gdi32 msimg32 kernel32 ntdll) +add_importlibs(uxtheme user32 advapi32 gdi32 msimg32 msvcrt kernel32 ntdll) add_cab_target(uxtheme 1) add_importlib_target(uxtheme.spec) diff --git a/dll/win32/winspool/CMakeLists.txt b/dll/win32/winspool/CMakeLists.txt index 95644369c73..2e74a3ce1b5 100644 --- a/dll/win32/winspool/CMakeLists.txt +++ b/dll/win32/winspool/CMakeLists.txt @@ -17,7 +17,7 @@ set_module_type(winspool win32dll) target_link_libraries(winspool wine) -add_importlibs(winspool advapi32 shlwapi kernel32 ntdll) +add_importlibs(winspool advapi32 shlwapi msvcrt kernel32 ntdll) add_cab_target(winspool 1) add_importlib_target(winspool.spec) diff --git a/dll/win32/winsta/CMakeLists.txt b/dll/win32/winsta/CMakeLists.txt index 5de0491a4ce..84084154177 100644 --- a/dll/win32/winsta/CMakeLists.txt +++ b/dll/win32/winsta/CMakeLists.txt @@ -22,7 +22,7 @@ set_module_type(winsta win32dll) target_link_libraries(winsta wine) -add_importlibs(winsta kernel32 ntdll) +add_importlibs(winsta msvcrt kernel32 ntdll) add_pch(winsta ${CMAKE_CURRENT_SOURCE_DIR}/winsta.h ${SOURCE}) add_cab_target(winsta 1) diff --git a/dll/win32/ws2_32/CMakeLists.txt b/dll/win32/ws2_32/CMakeLists.txt index 1f074426a9b..34218b2dc52 100644 --- a/dll/win32/ws2_32/CMakeLists.txt +++ b/dll/win32/ws2_32/CMakeLists.txt @@ -29,7 +29,7 @@ set_module_type(ws2_32 win32dll) target_link_libraries(ws2_32 wine) -add_importlibs(ws2_32 user32 advapi32 dnsapi ws2help kernel32 ntdll) +add_importlibs(ws2_32 user32 advapi32 dnsapi ws2help msvcrt kernel32 ntdll) add_pch(ws2_32 ${CMAKE_CURRENT_SOURCE_DIR}/include/ws2_32.h ${SOURCE}) add_cab_target(ws2_32 1) diff --git a/dll/win32/wshirda/CMakeLists.txt b/dll/win32/wshirda/CMakeLists.txt index a03f4d34ab0..7adc9b33e46 100644 --- a/dll/win32/wshirda/CMakeLists.txt +++ b/dll/win32/wshirda/CMakeLists.txt @@ -9,6 +9,6 @@ endif() set_module_type(wshirda win32dll) -add_importlibs(wshirda ws2_32 kernel32 ntdll) +add_importlibs(wshirda ws2_32 msvcrt kernel32 ntdll) add_cab_target(wshirda 1) diff --git a/dll/win32/wsock32/CMakeLists.txt b/dll/win32/wsock32/CMakeLists.txt index f69dccd78ce..8ec3b730ef4 100644 --- a/dll/win32/wsock32/CMakeLists.txt +++ b/dll/win32/wsock32/CMakeLists.txt @@ -9,5 +9,5 @@ endif() set_module_type(wsock32 win32dll) -add_importlibs(wsock32 ws2_32 kernel32 ntdll) +add_importlibs(wsock32 ws2_32 msvcrt kernel32 ntdll) add_cab_target(wsock32 1) diff --git a/dll/win32/wtsapi32/CMakeLists.txt b/dll/win32/wtsapi32/CMakeLists.txt index 0d26b06ed80..8dc2269712a 100644 --- a/dll/win32/wtsapi32/CMakeLists.txt +++ b/dll/win32/wtsapi32/CMakeLists.txt @@ -10,6 +10,6 @@ set_module_type(wtsapi32 win32dll) target_link_libraries(wtsapi32 wine) -add_importlibs(wtsapi32 advapi32 kernel32 ntdll) +add_importlibs(wtsapi32 advapi32 msvcrt kernel32 ntdll) add_cab_target(wtsapi32 1)