[DLLs]

 - hopefully put an end to this embarassing succession by adding missing linkage to msvcrt where needed.
Than you ld, for getting symbols out of thin air

svn path=/trunk/; revision=58356

diff --git a/reactos/dll/directx/dinput8/CMakeLists.txt b/reactos/dll/directx/dinput8/CMakeLists.txt
index 858e81b..2586837 100644 (file)
--- a/reactos/dll/directx/dinput8/CMakeLists.txt
+++ b/reactos/dll/directx/dinput8/CMakeLists.txt
@@ -21,6 +21,7 @@ target_link_libraries(dinput8
     wine)
 
 add_importlibs(dinput8
+    msvcrt
     user32
     advapi32
     ole32

diff --git a/reactos/dll/directx/dmusic/CMakeLists.txt b/reactos/dll/directx/dmusic/CMakeLists.txt
index f7ca6f2..21928a8 100644 (file)
--- a/reactos/dll/directx/dmusic/CMakeLists.txt
+++ b/reactos/dll/directx/dmusic/CMakeLists.txt
@@ -31,6 +31,7 @@ target_link_libraries(dmusic
     wine)
 
 add_importlibs(dmusic
+    msvcrt
     user32
     advapi32
     ole32

diff --git a/reactos/dll/directx/dplay/CMakeLists.txt b/reactos/dll/directx/dplay/CMakeLists.txt
index 1afc565..86dee46 100644 (file)
--- a/reactos/dll/directx/dplay/CMakeLists.txt
+++ b/reactos/dll/directx/dplay/CMakeLists.txt
@@ -16,12 +16,14 @@ target_link_libraries(dplay
     wine)
 
 add_importlibs(dplay
+    msvcrt
     user32
     advapi32
     ole32
     winmm
     dinput
     dplayx
+    kernel32
     ntdll)
 
 add_dependencies(dplay psdk)

diff --git a/reactos/dll/directx/msdmo/CMakeLists.txt b/reactos/dll/directx/msdmo/CMakeLists.txt
index b56831c..346b5df 100644 (file)
--- a/reactos/dll/directx/msdmo/CMakeLists.txt
+++ b/reactos/dll/directx/msdmo/CMakeLists.txt
@@ -17,6 +17,7 @@ set_module_type(msdmo win32dll UNICODE)
 target_link_libraries(msdmo uuid wine mediaobj_guid)
 
 add_importlibs(msdmo
+    msvcrt
     user32
     advapi32
     ole32

diff --git a/reactos/dll/win32/comcat/CMakeLists.txt b/reactos/dll/win32/comcat/CMakeLists.txt
index a9cb311..969a6c3 100644 (file)
--- a/reactos/dll/win32/comcat/CMakeLists.txt
+++ b/reactos/dll/win32/comcat/CMakeLists.txt
@@ -19,7 +19,7 @@ set_module_type(comcat win32dll)
 
 target_link_libraries(comcat uuid wine)
 
-add_importlibs(comcat ole32 user32 advapi32 ntdll)
+add_importlibs(comcat msvcrt ole32 user32 advapi32 kernel32 ntdll)
 
 add_dependencies(comcat psdk)
 add_cd_file(TARGET comcat DESTINATION reactos/system32 FOR all)

diff --git a/reactos/dll/win32/mcicda/CMakeLists.txt b/reactos/dll/win32/mcicda/CMakeLists.txt
index 8e77b9c..23a1f5a 100644 (file)
--- a/reactos/dll/win32/mcicda/CMakeLists.txt
+++ b/reactos/dll/win32/mcicda/CMakeLists.txt
@@ -12,6 +12,6 @@ add_library(mcicda SHARED ${SOURCE})
 
 set_module_type(mcicda win32dll)
 target_link_libraries(mcicda wine)
-add_importlibs(mcicda winmm user32 kernel32 ntdll)
+add_importlibs(mcicda msvcrt winmm user32 kernel32 ntdll)
 add_dependencies(mcicda psdk)
 add_cd_file(TARGET mcicda DESTINATION reactos/system32 FOR all)

diff --git a/reactos/dll/win32/mmdrv/CMakeLists.txt b/reactos/dll/win32/mmdrv/CMakeLists.txt
index 3349262..c5ff0b1 100644 (file)
--- a/reactos/dll/win32/mmdrv/CMakeLists.txt
+++ b/reactos/dll/win32/mmdrv/CMakeLists.txt
@@ -17,6 +17,6 @@ list(APPEND SOURCE
 add_library(mmdrv SHARED ${SOURCE})
 set_module_type(mmdrv win32dll UNICODE)
 
-add_importlibs(mmdrv winmm user32 kernel32 ntdll)
+add_importlibs(mmdrv msvcrt winmm user32 kernel32 ntdll)
 add_dependencies(mmdrv psdk)
 add_cd_file(TARGET mmdrv DESTINATION reactos/system32 FOR all)

diff --git a/reactos/dll/win32/msacm32/msacm32.drv/CMakeLists.txt b/reactos/dll/win32/msacm32/msacm32.drv/CMakeLists.txt
index b5b705d..407d47d 100644 (file)
--- a/reactos/dll/win32/msacm32/msacm32.drv/CMakeLists.txt
+++ b/reactos/dll/win32/msacm32/msacm32.drv/CMakeLists.txt
@@ -13,6 +13,6 @@ set_target_properties(msacm32.drv PROPERTIES SUFFIX "")
 
 target_link_libraries(msacm32.drv wine)
 
-add_importlibs(msacm32.drv msacm32 user32 winmm advapi32 kernel32 ntdll)
+add_importlibs(msacm32.drv msvcrt msacm32 user32 winmm advapi32 kernel32 ntdll)
 add_dependencies(msacm32.drv psdk)
 add_cd_file(TARGET msacm32.drv DESTINATION reactos/system32 FOR all)

diff --git a/reactos/dll/win32/nddeapi/CMakeLists.txt b/reactos/dll/win32/nddeapi/CMakeLists.txt
index 6b912e8..bdc2c19 100644 (file)
--- a/reactos/dll/win32/nddeapi/CMakeLists.txt
+++ b/reactos/dll/win32/nddeapi/CMakeLists.txt
@@ -14,6 +14,6 @@ set_module_type(nddeapi win32dll)
 
 target_link_libraries(nddeapi wine)
 
-add_importlibs(nddeapi kernel32 ntdll)
+add_importlibs(nddeapi msvcrt kernel32 ntdll)
 add_dependencies(nddeapi psdk)
 add_cd_file(TARGET nddeapi DESTINATION reactos/system32 FOR all)

diff --git a/reactos/dll/win32/olecli32/CMakeLists.txt b/reactos/dll/win32/olecli32/CMakeLists.txt
index a8a7f93..2d45688 100644 (file)
--- a/reactos/dll/win32/olecli32/CMakeLists.txt
+++ b/reactos/dll/win32/olecli32/CMakeLists.txt
@@ -11,6 +11,6 @@ list(APPEND SOURCE
 add_library(olecli32 SHARED ${SOURCE})
 set_module_type(olecli32 win32dll)
 target_link_libraries(olecli32 wine)
-add_importlibs(olecli32 ole32 gdi32 kernel32 ntdll)
+add_importlibs(olecli32 msvcrt ole32 gdi32 kernel32 ntdll)
 add_dependencies(olecli32 psdk)
 add_cd_file(TARGET olecli32 DESTINATION reactos/system32 FOR all)

diff --git a/reactos/dll/win32/olepro32/CMakeLists.txt b/reactos/dll/win32/olepro32/CMakeLists.txt
index 60a9ce5..e29383e 100644 (file)
--- a/reactos/dll/win32/olepro32/CMakeLists.txt
+++ b/reactos/dll/win32/olepro32/CMakeLists.txt
@@ -16,6 +16,7 @@ set_module_type(olepro32 win32dll)
 target_link_libraries(olepro32 wine)
 
 add_importlibs(olepro32
+    msvcrt
     oleaut32
     kernel32
     ntdll)

diff --git a/reactos/dll/win32/olesvr32/CMakeLists.txt b/reactos/dll/win32/olesvr32/CMakeLists.txt
index ce467d7..cb27dd1 100644 (file)
--- a/reactos/dll/win32/olesvr32/CMakeLists.txt
+++ b/reactos/dll/win32/olesvr32/CMakeLists.txt
@@ -15,6 +15,6 @@ set_module_type(olesvr32 win32dll)
 
 target_link_libraries(olesvr32 wine)
 
-add_importlibs(olesvr32 kernel32 ntdll)
+add_importlibs(olesvr32 msvcrt kernel32 ntdll)
 add_dependencies(olesvr32 psdk)
 add_cd_file(TARGET olesvr32 DESTINATION reactos/system32 FOR all)

diff --git a/reactos/dll/win32/rasapi32/CMakeLists.txt b/reactos/dll/win32/rasapi32/CMakeLists.txt
index d294852..18c4baa 100644 (file)
--- a/reactos/dll/win32/rasapi32/CMakeLists.txt
+++ b/reactos/dll/win32/rasapi32/CMakeLists.txt
@@ -12,6 +12,6 @@ list(APPEND SOURCE
 add_library(rasapi32 SHARED ${SOURCE})
 set_module_type(rasapi32 win32dll)
 target_link_libraries(rasapi32 wine)
-add_importlibs(rasapi32 kernel32 ntdll)
+add_importlibs(rasapi32 msvcrt kernel32 ntdll)
 add_dependencies(rasapi32 psdk)
 add_cd_file(TARGET rasapi32 DESTINATION reactos/system32 FOR all)

diff --git a/reactos/dll/win32/samsrv/CMakeLists.txt b/reactos/dll/win32/samsrv/CMakeLists.txt
index 419733b..101748a 100644 (file)
--- a/reactos/dll/win32/samsrv/CMakeLists.txt
+++ b/reactos/dll/win32/samsrv/CMakeLists.txt
@@ -25,6 +25,6 @@ add_library(samsrv SHARED ${SOURCE})
 set_module_type(samsrv win32dll UNICODE)
 
 target_link_libraries(samsrv wine ${PSEH_LIB})
-add_importlibs(samsrv rpcrt4 advapi32 kernel32 ntdll)
+add_importlibs(samsrv msvcrt rpcrt4 advapi32 kernel32 ntdll)
 add_dependencies(samsrv psdk)
 add_cd_file(TARGET samsrv DESTINATION reactos/system32 FOR all)

diff --git a/reactos/dll/win32/sxs/CMakeLists.txt b/reactos/dll/win32/sxs/CMakeLists.txt
index 17cfad4..01be538 100644 (file)
--- a/reactos/dll/win32/sxs/CMakeLists.txt
+++ b/reactos/dll/win32/sxs/CMakeLists.txt
@@ -14,6 +14,6 @@ list(APPEND SOURCE
 add_library(sxs SHARED ${SOURCE})
 set_module_type(sxs win32dll)
 target_link_libraries(sxs wine)
-add_importlibs(sxs oleaut32 ole32 kernel32 ntdll)
+add_importlibs(sxs msvcrt oleaut32 ole32 kernel32 ntdll)
 add_dependencies(sxs psdk)
 add_cd_file(TARGET sxs DESTINATION reactos/system32 FOR all)

diff --git a/reactos/dll/win32/tapi32/CMakeLists.txt b/reactos/dll/win32/tapi32/CMakeLists.txt
index 91bc5c8..c738e41 100644 (file)
--- a/reactos/dll/win32/tapi32/CMakeLists.txt
+++ b/reactos/dll/win32/tapi32/CMakeLists.txt
@@ -18,7 +18,7 @@ set_module_type(tapi32 win32dll)
 
 target_link_libraries(tapi32 wine)
 
-add_importlibs(tapi32 advapi32 kernel32 ntdll)
+add_importlibs(tapi32 msvcrt advapi32 kernel32 ntdll)
 add_dependencies(tapi32 psdk)
 
 add_cd_file(TARGET tapi32 DESTINATION reactos/system32 FOR all)

diff --git a/reactos/dll/win32/updspapi/CMakeLists.txt b/reactos/dll/win32/updspapi/CMakeLists.txt
index 61c6f6e..18d1b1c 100644 (file)
--- a/reactos/dll/win32/updspapi/CMakeLists.txt
+++ b/reactos/dll/win32/updspapi/CMakeLists.txt
@@ -14,7 +14,7 @@ set_module_type(updspapi win32dll)
 
 target_link_libraries(updspapi wine)
 
-add_importlibs(updspapi setupapi kernel32 ntdll)
+add_importlibs(updspapi msvcrt setupapi kernel32 ntdll)
 add_dependencies(updspapi psdk)
 
 add_cd_file(TARGET updspapi DESTINATION reactos/system32 FOR all)

diff --git a/reactos/dll/win32/version/CMakeLists.txt b/reactos/dll/win32/version/CMakeLists.txt
index f15f8eb..15c958d 100644 (file)
--- a/reactos/dll/win32/version/CMakeLists.txt
+++ b/reactos/dll/win32/version/CMakeLists.txt
@@ -16,7 +16,7 @@ add_library(version SHARED ${SOURCE})
 set_module_type(version win32dll)
 
 target_link_libraries(version wine)
-add_importlibs(version kernel32 ntdll)
+add_importlibs(version msvcrt kernel32 ntdll)
 add_dependencies(version psdk)
 add_cd_file(TARGET version DESTINATION reactos/system32 FOR all)
 

diff --git a/reactos/dll/win32/winmm/midimap/CMakeLists.txt b/reactos/dll/win32/winmm/midimap/CMakeLists.txt
index cb9134c..18ddfbc 100644 (file)
--- a/reactos/dll/win32/winmm/midimap/CMakeLists.txt
+++ b/reactos/dll/win32/winmm/midimap/CMakeLists.txt
@@ -10,7 +10,7 @@ set_module_type(midimap win32dll UNICODE)
 
 target_link_libraries(midimap uuid wine)
 
-add_importlibs(midimap advapi32 user32 winmm kernel32 ntdll)
+add_importlibs(midimap advapi32 user32 winmm msvcrt kernel32 ntdll)
 add_dependencies(midimap psdk)
 add_cd_file(TARGET midimap DESTINATION reactos/system32 FOR all)
 

diff --git a/reactos/dll/win32/wshtcpip/CMakeLists.txt b/reactos/dll/win32/wshtcpip/CMakeLists.txt
index 78ce6d1..e0c94ac 100644 (file)
--- a/reactos/dll/win32/wshtcpip/CMakeLists.txt
+++ b/reactos/dll/win32/wshtcpip/CMakeLists.txt
@@ -14,6 +14,6 @@ add_library(wshtcpip SHARED ${SOURCE})
 set_module_type(wshtcpip win32dll UNICODE)
 
 target_link_libraries(wshtcpip tdilib)
-add_importlibs(wshtcpip ws2_32 kernel32 ntdll)
+add_importlibs(wshtcpip ws2_32 msvcrt kernel32 ntdll)
 add_dependencies(wshtcpip psdk)
 add_cd_file(TARGET wshtcpip DESTINATION reactos/system32 FOR all)