[CMAKE]

On MSVC builds link eventvwr, dwnl, ftp, ping, telnet, tracert to ntdll to resolve _allmul and friends
link ftp to oldnames

svn path=/branches/cmake-bringup/; revision=49902

diff --git a/base/applications/calc/CMakeLists.txt b/base/applications/calc/CMakeLists.txt
index 9883959..f061578 100644 (file)
--- a/base/applications/calc/CMakeLists.txt
+++ b/base/applications/calc/CMakeLists.txt
@@ -14,5 +14,8 @@ add_executable(calc
 
 set_module_type(calc win32gui)
 add_importlibs(calc advapi32 user32 gdi32 msvcrt kernel32)
+if(MSVC)
+add_importlibs(calc ntdll)
+endif()
 
 add_cab_target(calc 1)
\ No newline at end of file

diff --git a/base/applications/mscutils/eventvwr/CMakeLists.txt b/base/applications/mscutils/eventvwr/CMakeLists.txt
index 18c8f98..9b11332 100644 (file)
--- a/base/applications/mscutils/eventvwr/CMakeLists.txt
+++ b/base/applications/mscutils/eventvwr/CMakeLists.txt
@@ -6,5 +6,8 @@ add_executable(eventvwr eventvwr.c eventvwr.rc)
 set_module_type(eventvwr win32gui)
 
 add_importlibs(eventvwr user32 comctl32 advapi32 msvcrt kernel32)
+if(MSVC)
+add_importlibs(eventvwr ntdll)
+endif()
 
 add_cab_target(eventvwr 1)
\ No newline at end of file

diff --git a/base/applications/network/dwnl/CMakeLists.txt b/base/applications/network/dwnl/CMakeLists.txt
index 142a36a..3c23757 100644 (file)
--- a/base/applications/network/dwnl/CMakeLists.txt
+++ b/base/applications/network/dwnl/CMakeLists.txt
@@ -9,5 +9,8 @@ set_module_type(dwnl win32cui)
 target_link_libraries(dwnl uuid)
 
 add_importlibs(dwnl urlmon wininet msvcrt kernel32)
+if(MSVC)
+add_importlibs(dwnl ntdll)
+endif()
 
 add_cab_target(dwnl 1)
\ No newline at end of file

diff --git a/base/applications/network/ftp/CMakeLists.txt b/base/applications/network/ftp/CMakeLists.txt
index 5f7d38b..83b2ccf 100644 (file)
--- a/base/applications/network/ftp/CMakeLists.txt
+++ b/base/applications/network/ftp/CMakeLists.txt
@@ -13,5 +13,9 @@ add_executable(ftp
 set_module_type(ftp win32cui)
 
 add_importlibs(ftp ws2_32 iphlpapi msvcrt kernel32)
+if(MSVC)
+target_link_libraries(ftp oldnames)
+add_importlibs(ftp ntdll)
+endif()
 
 add_cab_target(ftp 1)
\ No newline at end of file

diff --git a/base/applications/network/ping/CMakeLists.txt b/base/applications/network/ping/CMakeLists.txt
index cab7705..3dedcf8 100644 (file)
--- a/base/applications/network/ping/CMakeLists.txt
+++ b/base/applications/network/ping/CMakeLists.txt
@@ -5,5 +5,8 @@ add_executable(ping ping.c ping.rc)
 set_module_type(ping win32cui)
 
 add_importlibs(ping ws2_32 msvcrt kernel32)
+if(MSVC)
+add_importlibs(ping ntdll)
+endif()
 
 add_cab_target(ping 1)
\ No newline at end of file

diff --git a/base/applications/network/tracert/CMakeLists.txt b/base/applications/network/tracert/CMakeLists.txt
index d0c4f2f..f09f55d 100644 (file)
--- a/base/applications/network/tracert/CMakeLists.txt
+++ b/base/applications/network/tracert/CMakeLists.txt
@@ -5,5 +5,8 @@ add_executable(tracert tracert.c tracert.rc)
 set_module_type(tracert win32cui)
 
 add_importlibs(tracert ws2_32 msvcrt kernel32)
+if(MSVC)
+add_importlibs(tracert ntdll)
+endif()
 
 add_cab_target(tracert 1)
\ No newline at end of file