From 2541969bd0606915083aa98abe41d51311c1debb Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Fri, 8 Oct 2010 23:06:11 +0000 Subject: [PATCH] [CMAKE] - More work on the base modules. svn path=/branches/cmake-bringup/; revision=49062 --- base/applications/sndvol32/CMakeLists.txt | 2 +- base/applications/winhlp32/CMakeLists.txt | 13 +++++++------ base/services/CMakeLists.txt | 2 +- base/services/audiosrv/CMakeLists.txt | 2 +- base/services/eventlog/CMakeLists.txt | 2 +- base/services/rpcss/CMakeLists.txt | 2 +- base/services/spoolsv/CMakeLists.txt | 2 +- base/services/svchost/CMakeLists.txt | 2 +- base/services/tcpsvcs/CMakeLists.txt | 2 +- base/services/telnetd/CMakeLists.txt | 2 +- base/services/tftpd/CMakeLists.txt | 2 +- base/services/umpnpmgr/CMakeLists.txt | 4 +++- base/services/wlansvc/CMakeLists.txt | 4 +++- base/setup/reactos/CMakeLists.txt | 8 ++++---- base/setup/setup/CMakeLists.txt | 6 ++---- base/setup/usetup/CMakeLists.txt | 5 ++--- base/setup/vmwinst/CMakeLists.txt | 8 ++++---- base/setup/welcome/CMakeLists.txt | 6 ++---- base/shell/explorer-new/CMakeLists.txt | 8 +++++--- base/system/autochk/CMakeLists.txt | 1 + base/system/bootok/CMakeLists.txt | 2 +- base/system/expand/CMakeLists.txt | 2 +- base/system/format/CMakeLists.txt | 2 +- base/system/lsass/CMakeLists.txt | 2 +- base/system/msiexec/CMakeLists.txt | 4 +++- base/system/regsvr32/CMakeLists.txt | 2 +- base/system/rundll32/CMakeLists.txt | 2 +- base/system/runonce/CMakeLists.txt | 2 +- base/system/services/CMakeLists.txt | 2 +- base/system/smss/CMakeLists.txt | 3 ++- base/system/userinit/CMakeLists.txt | 5 +++-- base/system/winlogon/CMakeLists.txt | 5 +++-- 32 files changed, 62 insertions(+), 54 deletions(-) diff --git a/base/applications/sndvol32/CMakeLists.txt b/base/applications/sndvol32/CMakeLists.txt index 4ac9f4930b4..ee26494e705 100644 --- a/base/applications/sndvol32/CMakeLists.txt +++ b/base/applications/sndvol32/CMakeLists.txt @@ -13,4 +13,4 @@ add_pch(sndvol32 ${CMAKE_CURRENT_SOURCE_DIR}/sndvol32.h ${SOURCE}) set_module_type(sndvol32 win32gui) -add_importlibs(sndvol32 user32 advapi32 gdi32 comctl32 shell32 winmm msvcrt kernel32) +add_importlibs(sndvol32 user32 advapi32 gdi32 comctl32 shell32 winmm msvcrt kernel32 ntdll) diff --git a/base/applications/winhlp32/CMakeLists.txt b/base/applications/winhlp32/CMakeLists.txt index b98e4391c72..d46378a194e 100644 --- a/base/applications/winhlp32/CMakeLists.txt +++ b/base/applications/winhlp32/CMakeLists.txt @@ -1,9 +1,11 @@ + include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -add_definitions(-D__ROS_LONG64__) -add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE) -add_definitions(-Dfileno=_fileno) -add_definitions(-Disatty=_isatty) +add_definitions( + -D__ROS_LONG64__ + -D_CRT_NONSTDC_NO_DEPRECATE + -Dfileno=_fileno + -Disatty=_isatty) add_executable(winhlp32 callback.c @@ -17,5 +19,4 @@ add_executable(winhlp32 set_module_type(winhlp32 win32gui) target_link_libraries(winhlp32 wine) - -add_importlibs(winhlp32 user32 gdi32 shell32 comctl32 comdlg32 msvcrt kernel32) +add_importlibs(winhlp32 user32 gdi32 shell32 comctl32 comdlg32 msvcrt kernel32 ntdll) diff --git a/base/services/CMakeLists.txt b/base/services/CMakeLists.txt index 0672ef851f8..d017b50c845 100644 --- a/base/services/CMakeLists.txt +++ b/base/services/CMakeLists.txt @@ -6,6 +6,6 @@ add_subdirectory(spoolsv) add_subdirectory(svchost) add_subdirectory(tcpsvcs) add_subdirectory(telnetd) -add_subdirectory(tftpd) +#add_subdirectory(tftpd) add_subdirectory(umpnpmgr) add_subdirectory(wlansvc) diff --git a/base/services/audiosrv/CMakeLists.txt b/base/services/audiosrv/CMakeLists.txt index a48aff2c889..22d50cd4e95 100644 --- a/base/services/audiosrv/CMakeLists.txt +++ b/base/services/audiosrv/CMakeLists.txt @@ -11,5 +11,5 @@ add_executable(audiosrv audiosrv.rc) set_module_type(audiosrv win32cui) -add_importlibs(audiosrv advapi32 user32 setupapi msvcrt) +add_importlibs(audiosrv advapi32 user32 setupapi msvcrt kernel32) diff --git a/base/services/eventlog/CMakeLists.txt b/base/services/eventlog/CMakeLists.txt index 092589d553c..05e2f3b83d7 100644 --- a/base/services/eventlog/CMakeLists.txt +++ b/base/services/eventlog/CMakeLists.txt @@ -18,4 +18,4 @@ add_pch(eventlog ${CMAKE_CURRENT_SOURCE_DIR}/eventlog.h ${SOURCE}) set_module_type(eventlog win32cui) -add_importlibs(eventlog advapi32 rpcrt4 msvcrt) +add_importlibs(eventlog advapi32 rpcrt4 msvcrt kernel32 ntdll) diff --git a/base/services/rpcss/CMakeLists.txt b/base/services/rpcss/CMakeLists.txt index a7f96c016c5..fdf3a006e38 100644 --- a/base/services/rpcss/CMakeLists.txt +++ b/base/services/rpcss/CMakeLists.txt @@ -16,4 +16,4 @@ add_pch(rpcss ${CMAKE_CURRENT_SOURCE_DIR}/rpcss.h ${SOURCE}) set_module_type(rpcss win32cui) -add_importlibs(rpcss advapi32 rpcrt4 msvcrt) +add_importlibs(rpcss advapi32 rpcrt4 msvcrt kernel32 ntdll) diff --git a/base/services/spoolsv/CMakeLists.txt b/base/services/spoolsv/CMakeLists.txt index 30faf3d98fa..f14e3f2636b 100644 --- a/base/services/spoolsv/CMakeLists.txt +++ b/base/services/spoolsv/CMakeLists.txt @@ -6,4 +6,4 @@ add_executable(spoolsv spoolsv.c spoolsv.rc) target_link_libraries(spoolsv wine) set_module_type(spoolsv win32cui) -add_importlibs(spoolsv advapi32 msvcrt) +add_importlibs(spoolsv advapi32 msvcrt kernel32 ntdll) diff --git a/base/services/svchost/CMakeLists.txt b/base/services/svchost/CMakeLists.txt index 9d2875aeec7..454f0f98e2d 100644 --- a/base/services/svchost/CMakeLists.txt +++ b/base/services/svchost/CMakeLists.txt @@ -2,4 +2,4 @@ add_executable(svchost svchost.c svchost.rc) set_module_type(svchost win32cui) -add_importlibs(svchost advapi32 msvcrt) +add_importlibs(svchost advapi32 msvcrt kernel32 ntdll) diff --git a/base/services/tcpsvcs/CMakeLists.txt b/base/services/tcpsvcs/CMakeLists.txt index e5717b2caad..d1b3119b168 100644 --- a/base/services/tcpsvcs/CMakeLists.txt +++ b/base/services/tcpsvcs/CMakeLists.txt @@ -16,5 +16,5 @@ add_executable(tcpsvcs ${CMAKE_CURRENT_BINARY_DIR}/tcpsvcs_tcpsvcs.h.gch ${SOURC add_pch(tcpsvcs ${CMAKE_CURRENT_SOURCE_DIR}/tcpsvcs.h ${SOURCE}) set_module_type(tcpsvcs win32cui) -add_importlibs(tcpsvcs ws2_32 advapi32 msvcrt) +add_importlibs(tcpsvcs ws2_32 advapi32 msvcrt kernel32 ntdll) diff --git a/base/services/telnetd/CMakeLists.txt b/base/services/telnetd/CMakeLists.txt index c29a3ad824f..76ef9f2bac7 100644 --- a/base/services/telnetd/CMakeLists.txt +++ b/base/services/telnetd/CMakeLists.txt @@ -7,5 +7,5 @@ add_executable(telnetd target_link_libraries(telnetd wine) set_module_type(telnetd win32cui) -add_importlibs(telnetd advapi32 ws2_32 msvcrt) +add_importlibs(telnetd advapi32 ws2_32 msvcrt kernel32 ntdll) diff --git a/base/services/tftpd/CMakeLists.txt b/base/services/tftpd/CMakeLists.txt index 3ed1214854a..967dd158ca1 100644 --- a/base/services/tftpd/CMakeLists.txt +++ b/base/services/tftpd/CMakeLists.txt @@ -4,4 +4,4 @@ add_executable(tftpd tftpd.cpp) target_link_libraries(tftpd wine) set_module_type(tftpd win32cui) -add_importlibs(tftpd advapi32 ws2_32 msvcrt) +add_importlibs(tftpd advapi32 ws2_32 msvcrt kernel32 ntdll) diff --git a/base/services/umpnpmgr/CMakeLists.txt b/base/services/umpnpmgr/CMakeLists.txt index 01341d2d000..4d2eaad7df5 100644 --- a/base/services/umpnpmgr/CMakeLists.txt +++ b/base/services/umpnpmgr/CMakeLists.txt @@ -13,4 +13,6 @@ add_importlibs(umpnpmgr advapi32 rpcrt4 userenv - msvcrt) + msvcrt + kernel32 + ntdll) diff --git a/base/services/wlansvc/CMakeLists.txt b/base/services/wlansvc/CMakeLists.txt index d692fb85c6b..1ecb38a5159 100644 --- a/base/services/wlansvc/CMakeLists.txt +++ b/base/services/wlansvc/CMakeLists.txt @@ -11,4 +11,6 @@ add_importlibs(wlansvc advapi32 rpcrt4 iphlpapi - msvcrt) + msvcrt + kernel32 + ntdll) diff --git a/base/setup/reactos/CMakeLists.txt b/base/setup/reactos/CMakeLists.txt index ed1bfa8ee91..89168fbb77c 100644 --- a/base/setup/reactos/CMakeLists.txt +++ b/base/setup/reactos/CMakeLists.txt @@ -1,9 +1,7 @@ set_unicode() -add_executable(reactos - reactos.c - reactos.rc) +add_executable(reactos reactos.c reactos.rc) target_link_libraries(reactos uuid) @@ -13,4 +11,6 @@ add_importlibs(reactos user32 comctl32 setupapi - msvcrt) + msvcrt + kernel32 + ntdll) diff --git a/base/setup/setup/CMakeLists.txt b/base/setup/setup/CMakeLists.txt index edf073e44e1..d2779e4cef3 100644 --- a/base/setup/setup/CMakeLists.txt +++ b/base/setup/setup/CMakeLists.txt @@ -1,9 +1,7 @@ set_unicode() -add_executable(setup - setup.c - setup.rc) +add_executable(setup setup.c setup.rc) set_module_type(setup win32gui) -add_importlibs(setup userenv msvcrt) +add_importlibs(setup userenv msvcrt kernel32 ntdll) diff --git a/base/setup/usetup/CMakeLists.txt b/base/setup/usetup/CMakeLists.txt index fe9d1264acb..d7d203d1429 100644 --- a/base/setup/usetup/CMakeLists.txt +++ b/base/setup/usetup/CMakeLists.txt @@ -3,7 +3,7 @@ include_directories(${REACTOS_SOURCE_DIR}/lib/newinflib) include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/zlib) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/drivers) -add_executable(usetup WIN32 +add_executable(usetup interface/usetup.c interface/devinst.c interface/consup.c @@ -38,5 +38,4 @@ target_link_libraries(usetup mingw_common) set_module_type(usetup nativecui) - -add_dependencies(usetup psdk buildno_header) +add_importlibs(usetup kernel32 ntdll) diff --git a/base/setup/vmwinst/CMakeLists.txt b/base/setup/vmwinst/CMakeLists.txt index 3c6033b4cb2..3eda4610e4c 100644 --- a/base/setup/vmwinst/CMakeLists.txt +++ b/base/setup/vmwinst/CMakeLists.txt @@ -1,9 +1,7 @@ set_unicode() -add_executable(vmwinst - vmwinst.c - vmwinst.rc) +add_executable(vmwinst vmwinst.c vmwinst.rc) target_link_libraries(vmwinst pseh) @@ -16,4 +14,6 @@ add_importlibs(vmwinst user32 setupapi shell32 - msvcrt) + msvcrt + kernel32 + ntdll) diff --git a/base/setup/welcome/CMakeLists.txt b/base/setup/welcome/CMakeLists.txt index 40f43e94e96..970b28e7919 100644 --- a/base/setup/welcome/CMakeLists.txt +++ b/base/setup/welcome/CMakeLists.txt @@ -1,9 +1,7 @@ set_unicode() -add_executable(welcome - welcome.c - welcome.rc) +add_executable(welcome welcome.c welcome.rc) set_module_type(welcome win32gui) -add_importlibs(welcome gdi32 user32 msvcrt) +add_importlibs(welcome gdi32 user32 msvcrt kernel32 ntdll) diff --git a/base/shell/explorer-new/CMakeLists.txt b/base/shell/explorer-new/CMakeLists.txt index 601bc5f874c..c9ec23a0f8c 100644 --- a/base/shell/explorer-new/CMakeLists.txt +++ b/base/shell/explorer-new/CMakeLists.txt @@ -20,9 +20,9 @@ add_executable(explorer_new ${CMAKE_CURRENT_BINARY_DIR}/explorer_new_precomp.h.g target_link_libraries(explorer_new uuid) -add_pch(explorer_new ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h SOURCE) +add_pch(explorer_new ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) set_module_type(explorer_new win32gui) -add_importlibs(explorer_new +add_importlibs(explorer_new advapi32 gdi32 user32 @@ -31,4 +31,6 @@ add_importlibs(explorer_new oleaut32 shell32 shlwapi - msvcrt) + msvcrt + kernel32 + ntdll) diff --git a/base/system/autochk/CMakeLists.txt b/base/system/autochk/CMakeLists.txt index 74e2f728bc4..39a0dc048e1 100644 --- a/base/system/autochk/CMakeLists.txt +++ b/base/system/autochk/CMakeLists.txt @@ -4,3 +4,4 @@ add_executable(autochk WIN32 autochk.c autochk.rc) set_module_type(autochk nativecui) target_link_libraries(autochk mingw_common nt) +add_importlibs(autochk kernel32 ntdll) \ No newline at end of file diff --git a/base/system/bootok/CMakeLists.txt b/base/system/bootok/CMakeLists.txt index ec954716a08..27d1a5ca415 100644 --- a/base/system/bootok/CMakeLists.txt +++ b/base/system/bootok/CMakeLists.txt @@ -5,4 +5,4 @@ add_executable(bootok bootok.c bootok.rc) set_module_type(bootok win32cui) -add_importlibs(bootok advapi32 msvcrt) +add_importlibs(bootok advapi32 msvcrt kernel32 ntdll) diff --git a/base/system/expand/CMakeLists.txt b/base/system/expand/CMakeLists.txt index 67dad661a8e..d3b0208b0eb 100644 --- a/base/system/expand/CMakeLists.txt +++ b/base/system/expand/CMakeLists.txt @@ -5,4 +5,4 @@ add_executable(expand expand.c expand.rc) set_module_type(expand win32cui) -add_importlibs(expand lz32 setupapi user32 msvcrt) +add_importlibs(expand lz32 setupapi user32 msvcrt kernel32 ntdll) diff --git a/base/system/format/CMakeLists.txt b/base/system/format/CMakeLists.txt index 67d69971902..2cce46c7f3d 100644 --- a/base/system/format/CMakeLists.txt +++ b/base/system/format/CMakeLists.txt @@ -6,4 +6,4 @@ add_executable(format format.c format.rc) set_module_type(format win32cui) -add_importlibs(format ntdll user32 fmifs msvcrt) +add_importlibs(format ntdll user32 fmifs msvcrt kernel32 ntdll) diff --git a/base/system/lsass/CMakeLists.txt b/base/system/lsass/CMakeLists.txt index 8ffd02281c3..af69a957814 100644 --- a/base/system/lsass/CMakeLists.txt +++ b/base/system/lsass/CMakeLists.txt @@ -7,4 +7,4 @@ add_executable(lsass lsass.c lsass.rc) set_module_type(lsass win32gui) -add_importlibs(lsass advapi32 lsasrv msvcrt) +add_importlibs(lsass advapi32 lsasrv msvcrt kernel32 ntdll) diff --git a/base/system/msiexec/CMakeLists.txt b/base/system/msiexec/CMakeLists.txt index cde608b897a..80d1b273fe3 100644 --- a/base/system/msiexec/CMakeLists.txt +++ b/base/system/msiexec/CMakeLists.txt @@ -9,5 +9,7 @@ add_executable(msiexec set_module_type(msiexec win32gui) -add_importlibs(msiexec user32 advapi32 ole32 msi msvcrt) target_link_libraries(msiexec uuid wine) + +add_importlibs(msiexec user32 advapi32 ole32 msi msvcrt kernel32 ntdll) + diff --git a/base/system/regsvr32/CMakeLists.txt b/base/system/regsvr32/CMakeLists.txt index 452bdd685fe..1a7dae48243 100644 --- a/base/system/regsvr32/CMakeLists.txt +++ b/base/system/regsvr32/CMakeLists.txt @@ -7,4 +7,4 @@ add_executable(regsvr32 regsvr32.c regsvr32.rc) set_module_type(regsvr32 win32gui) -add_importlibs(regsvr32 user32 shell32 ole32 msvcrt) +add_importlibs(regsvr32 user32 shell32 ole32 msvcrt kernel32 ntdll) diff --git a/base/system/rundll32/CMakeLists.txt b/base/system/rundll32/CMakeLists.txt index 6d5723e95e3..71796478d12 100644 --- a/base/system/rundll32/CMakeLists.txt +++ b/base/system/rundll32/CMakeLists.txt @@ -7,4 +7,4 @@ add_executable(rundll32 rundll32.c rundll32.rc) set_module_type(rundll32 win32gui) -add_importlibs(rundll32 user32 msvcrt) +add_importlibs(rundll32 user32 msvcrt kernel32 ntdll) diff --git a/base/system/runonce/CMakeLists.txt b/base/system/runonce/CMakeLists.txt index 27a6cc1dead..25209c3eaeb 100644 --- a/base/system/runonce/CMakeLists.txt +++ b/base/system/runonce/CMakeLists.txt @@ -5,4 +5,4 @@ add_executable(runonce runonce.c runonce.rc) set_module_type(runonce win32gui) -add_importlibs(runonce advapi32 user32 msvcrt) +add_importlibs(runonce advapi32 user32 msvcrt kernel32 ntdll) diff --git a/base/system/services/CMakeLists.txt b/base/system/services/CMakeLists.txt index fa913646a13..903ce7eb51a 100644 --- a/base/system/services/CMakeLists.txt +++ b/base/system/services/CMakeLists.txt @@ -22,5 +22,5 @@ add_pch(services ${CMAKE_CURRENT_SOURCE_DIR}/services.h ${SOURCE}) set_module_type(services win32cui) -add_importlibs(services user32 advapi32 rpcrt4 msvcrt) +add_importlibs(services user32 advapi32 rpcrt4 msvcrt kernel32 ntdll) diff --git a/base/system/smss/CMakeLists.txt b/base/system/smss/CMakeLists.txt index 61dff0847c0..b1a5c0bf9ee 100644 --- a/base/system/smss/CMakeLists.txt +++ b/base/system/smss/CMakeLists.txt @@ -24,8 +24,9 @@ list(APPEND SOURCE add_executable(smss WIN32 ${CMAKE_CURRENT_BINARY_DIR}/smss_smss.h.gch ${SOURCE}) +target_link_libraries(smss mingw_common nt smlib) + add_pch(smss ${CMAKE_CURRENT_SOURCE_DIR}/smss.h ${SOURCE}) set_module_type(smss nativecui) add_importlibs(smss ntdll) -target_link_libraries(smss mingw_common nt smlib) diff --git a/base/system/userinit/CMakeLists.txt b/base/system/userinit/CMakeLists.txt index 000d7b6375c..79fb7c230a5 100644 --- a/base/system/userinit/CMakeLists.txt +++ b/base/system/userinit/CMakeLists.txt @@ -5,7 +5,8 @@ set_rc_compiler() add_executable(userinit userinit.c userinit.rc) +target_link_libraries(userinit wine) + set_module_type(userinit win32gui) -add_importlibs(userinit user32 gdi32 advapi32 shell32 shlwapi msvcrt) -target_link_libraries(userinit wine) +add_importlibs(userinit user32 gdi32 advapi32 shell32 shlwapi msvcrt kernel32 ntdll) diff --git a/base/system/winlogon/CMakeLists.txt b/base/system/winlogon/CMakeLists.txt index 5d6f9347c68..e97ce9d0ec1 100644 --- a/base/system/winlogon/CMakeLists.txt +++ b/base/system/winlogon/CMakeLists.txt @@ -10,9 +10,10 @@ list(APPEND SOURCE add_executable(winlogon ${CMAKE_CURRENT_BINARY_DIR}/winlogon_winlogon.h.gch ${SOURCE}) +target_link_libraries(winlogon wine) + add_pch(winlogon ${CMAKE_CURRENT_SOURCE_DIR}/winlogon.h ${SOURCE}) set_module_type(winlogon win32gui) -add_importlibs(winlogon user32 advapi32 userenv secur32 msvcrt) -target_link_libraries(winlogon wine) +add_importlibs(winlogon user32 advapi32 userenv secur32 msvcrt kernel32 ntdll) -- 2.17.1