[CMAKE]
authorAmine Khaldi <amine.khaldi@reactos.org>
Fri, 8 Oct 2010 22:26:41 +0000 (22:26 +0000)
committerAmine Khaldi <amine.khaldi@reactos.org>
Fri, 8 Oct 2010 22:26:41 +0000 (22:26 +0000)
- More work on the base modules.
- Fix a typo.
- Fix shlwapi and audio_test builds.

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

55 files changed:
base/applications/CMakeLists.txt
base/applications/cmdutils/dbgprint/CMakeLists.txt
base/applications/cmdutils/doskey/CMakeLists.txt
base/applications/cmdutils/find/CMakeLists.txt
base/applications/cmdutils/hostname/CMakeLists.txt
base/applications/cmdutils/lodctr/CMakeLists.txt
base/applications/cmdutils/more/CMakeLists.txt
base/applications/cmdutils/reg/CMakeLists.txt
base/applications/cmdutils/xcopy/CMakeLists.txt
base/applications/control/CMakeLists.txt
base/applications/dxdiag/CMakeLists.txt
base/applications/extrac32/CMakeLists.txt
base/applications/fontview/CMakeLists.txt
base/applications/games/CMakeLists.txt
base/applications/games/winemine/CMakeLists.txt
base/applications/hh/CMakeLists.txt
base/applications/iexplore/CMakeLists.txt
base/applications/kbswitch/CMakeLists.txt
base/applications/logoff/CMakeLists.txt
base/applications/magnify/CMakeLists.txt
base/applications/mmc/CMakeLists.txt
base/applications/mplay32/CMakeLists.txt
base/applications/msconfig/CMakeLists.txt
base/applications/mscutils/devmgmt/CMakeLists.txt
base/applications/mscutils/eventvwr/CMakeLists.txt
base/applications/mscutils/servman/CMakeLists.txt
base/applications/mstsc/CMakeLists.txt
base/applications/network/CMakeLists.txt
base/applications/network/arp/CMakeLists.txt
base/applications/network/dwnl/CMakeLists.txt
base/applications/network/finger/CMakeLists.txt
base/applications/network/ftp/CMakeLists.txt
base/applications/network/ipconfig/CMakeLists.txt
base/applications/network/net/CMakeLists.txt
base/applications/network/netstat/CMakeLists.txt
base/applications/network/nslookup/CMakeLists.txt
base/applications/network/ping/CMakeLists.txt
base/applications/network/route/CMakeLists.txt
base/applications/network/telnet/CMakeLists.txt
base/applications/network/tracert/CMakeLists.txt
base/applications/network/whois/CMakeLists.txt
base/applications/paint/CMakeLists.txt
base/applications/regedit/CMakeLists.txt
base/applications/regedt32/CMakeLists.txt
base/applications/sc/CMakeLists.txt
base/applications/shutdown/CMakeLists.txt
base/applications/sndvol32/CMakeLists.txt
base/applications/taskmgr/CMakeLists.txt
base/applications/winhlp32/CMakeLists.txt
base/applications/winver/CMakeLists.txt
base/applications/write/CMakeLists.txt
base/shell/CMakeLists.txt
dll/win32/olecli32/CMakeLists.txt
dll/win32/shlwapi/CMakeLists.txt
drivers/wdm/audio/backpln/audio_test/CMakeLists.txt

index e4ee917..75fd0c8 100644 (file)
@@ -27,7 +27,7 @@ add_subdirectory(regedt32)
 add_subdirectory(sc)
 #add_subdirectory(screensavers)
 add_subdirectory(shutdown)
-add_subdirectory(sndrec32)
+#add_subdirectory(sndrec32)
 add_subdirectory(sndvol32)
 add_subdirectory(taskmgr)
 add_subdirectory(winhlp32)
index 0a9dd1a..4ec6ed0 100644 (file)
@@ -2,4 +2,4 @@
 add_executable(dbgprint dbgprint.c)
 
 set_module_type(dbgprint win32cui)
-add_importlibs(dbgprint msvcrt)
+add_importlibs(dbgprint msvcrt kernel32)
index 5b52082..972ca87 100644 (file)
@@ -4,4 +4,4 @@ set_unicode()
 add_executable(doskey doskey.c doskey.rc)
 
 set_module_type(doskey win32cui)
-add_importlibs(doskey user32 msvcrt)
+add_importlibs(doskey user32 msvcrt kernel32)
index db02867..bd897d8 100644 (file)
@@ -2,4 +2,4 @@
 add_executable(find find.c find.rc)
 
 set_module_type(find win32cui)
-add_importlibs(find user32 msvcrt)
+add_importlibs(find user32 msvcrt kernel32)
index a52cda0..e22e80f 100644 (file)
@@ -2,4 +2,4 @@
 add_executable(hostname hostname.c hostname.rc)
 
 set_module_type(hostname win32cui)
-add_importlibs(hostname msvcrt)
+add_importlibs(hostname msvcrt kernel32)
index c14d39f..123438f 100644 (file)
@@ -4,4 +4,4 @@ set_unicode()
 add_executable(lodctr lodctr_main.c)
 
 set_module_type(lodctr win32cui)
-add_importlibs(lodctr loadperf msvcrt)
+add_importlibs(lodctr loadperf msvcrt kernel32)
index 08ff486..849b074 100644 (file)
@@ -2,4 +2,4 @@
 add_executable(more more.c more.rc)
 
 set_module_type(more win32cui)
-add_importlibs(more user32 msvcrt)
+add_importlibs(more user32 msvcrt kernel32)
index 7a218f8..a7b102e 100644 (file)
@@ -7,4 +7,4 @@ add_definitions(-D_WIN32_WINNT=0x600)
 add_executable(reg reg.c rsrc.rc)
 
 set_module_type(reg win32cui)
-add_importlibs(reg advapi32 user32 msvcrt)
+add_importlibs(reg advapi32 user32 msvcrt kernel32)
index 393eb06..a82deed 100644 (file)
@@ -6,4 +6,4 @@ add_executable(xcopy xcopy.c rsrc.rc)
 target_link_libraries(xcopy wine)
 
 set_module_type(xcopy win32cui)
-add_importlibs(xcopy shell32 user32 msvcrt)
+add_importlibs(xcopy shell32 user32 msvcrt kernel32 ntdll)
index a545694..4efd9a7 100644 (file)
@@ -4,4 +4,4 @@ set_unicode()
 add_executable(control control.c control.rc)
 
 set_module_type(control win32gui)
-add_importlibs(control advapi32 shell32 msvcrt)
+add_importlibs(control advapi32 shell32 msvcrt kernel32)
index b4b23d4..ddfefbb 100644 (file)
@@ -27,4 +27,4 @@ set_module_type(dxdiag win32gui)
 
 target_link_libraries(dxdiag dxguid)
 
-add_importlibs(dxdiag user32 advapi32 comctl32 dinput8 setupapi dsound ddraw version gdi32 winmm d3d9 msvcrt)
+add_importlibs(dxdiag user32 advapi32 comctl32 dinput8 setupapi dsound ddraw version gdi32 winmm d3d9 msvcrt kernel32)
index edc4205..2706831 100644 (file)
@@ -6,4 +6,4 @@ add_executable(extrac32 extrac32.c)
 target_link_libraries(extrac32 wine)
 
 set_module_type(extrac32 win32gui)
-add_importlibs(extrac32 shell32 setupapi shlwapi user32 msvcrt)
+add_importlibs(extrac32 shell32 setupapi shlwapi user32 msvcrt kernel32 ntdll)
index 56adb0f..f564e6e 100644 (file)
@@ -5,4 +5,4 @@ add_executable(fontview
     fontview.rc)
 
 set_module_type(fontview win32gui)
-add_importlibs(fontview gdi32 shell32 user32 msvcrt)
+add_importlibs(fontview gdi32 shell32 user32 msvcrt kernel32)
index f82ff81..0fc5601 100644 (file)
@@ -1,4 +1,4 @@
 
-add_subdirectory(solitaire)
+#add_subdirectory(solitaire)
 #add_subdirectory(spider)
 add_subdirectory(winemine)
index 2d19c3e..844eefe 100644 (file)
@@ -11,4 +11,4 @@ add_executable(winemine
     rsrc.rc)
 
 set_module_type(winemine win32gui)
-add_importlibs(winemine user32 gdi32 advapi32 shell32 msvcrt)
+add_importlibs(winemine user32 gdi32 advapi32 shell32 msvcrt kernel32)
index bad7365..edbcf56 100644 (file)
@@ -2,4 +2,4 @@
 add_executable(hh main.c hh.rc)
 
 set_module_type(hh win32gui)
-add_importlibs(hh gdi32 user32 msvcrt)
+add_importlibs(hh gdi32 user32 msvcrt kernel32)
index eff630e..c37165b 100644 (file)
@@ -2,4 +2,4 @@
 add_executable(iexplore main.c iexplore.rc)
 
 set_module_type(iexplore win32gui)
-add_importlibs(iexplore shdocvw msvcrt)
+add_importlibs(iexplore shdocvw msvcrt kernel32)
index 1a77556..644de55 100644 (file)
@@ -4,6 +4,6 @@ set_unicode()
 add_executable(kbswitch kbswitch.c kbswitch.rc)
 
 set_module_type(kbswitch win32gui)
-add_importlibs(kbswitch advapi32 user32 shell32 gdi32 msvcrt)
+add_importlibs(kbswitch advapi32 user32 shell32 gdi32 msvcrt kernel32)
 
 add_subdirectory(kbsdll)
index 1cd66e0..35a8b8d 100644 (file)
@@ -10,4 +10,4 @@ add_pch(logoff ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
 
 set_module_type(logoff win32cui)
 
-add_importlibs(logoff advapi32 user32 msvcrt)
+add_importlibs(logoff advapi32 user32 msvcrt kernel32)
index 0023042..36a5d33 100644 (file)
@@ -6,4 +6,4 @@ add_executable(magnify
 
 set_module_type(magnify win32gui)
 
-add_importlibs(magnify user32 gdi32 advapi32 shell32 msvcrt)
+add_importlibs(magnify user32 gdi32 advapi32 shell32 msvcrt kernel32)
index 348df60..28ed849 100644 (file)
@@ -13,4 +13,4 @@ add_pch(mmcclient ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
 
 set_module_type(mmcclient win32gui)
 
-add_importlibs(mmcclient user32 gdi32 comdlg32 advapi32 shell32 comctl32 msvcrt)
+add_importlibs(mmcclient user32 gdi32 comdlg32 advapi32 shell32 comctl32 msvcrt kernel32)
index 21fdac1..99495cf 100644 (file)
@@ -5,4 +5,4 @@ add_executable(mplay32 mplay32.c mplay32.rc)
 
 set_module_type(mplay32 win32gui)
 
-add_importlibs(mplay32 advapi32 comctl32 comdlg32 user32 gdi32 winmm shell32 msvcrt)
+add_importlibs(mplay32 advapi32 comctl32 comdlg32 user32 gdi32 winmm shell32 msvcrt kernel32)
index cd34da7..c5791b3 100644 (file)
@@ -17,4 +17,4 @@ add_pch(msconfig ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
 
 set_module_type(msconfig win32gui)
 
-add_importlibs(msconfig user32 advapi32 version comctl32 shell32 shlwapi msvcrt)
+add_importlibs(msconfig user32 advapi32 version comctl32 shell32 shlwapi msvcrt kernel32)
index effad6f..4e77785 100644 (file)
@@ -15,4 +15,4 @@ add_pch(devmgmt ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
 
 set_module_type(devmgmt win32gui)
 
-add_importlibs(devmgmt setupapi gdi32 user32 comctl32 advapi32 devmgr msvcrt)
+add_importlibs(devmgmt setupapi gdi32 user32 comctl32 advapi32 devmgr msvcrt kernel32)
index fdb0803..c348ba9 100644 (file)
@@ -5,4 +5,4 @@ add_executable(eventvwr eventvwr.c eventvwr.rc)
 
 set_module_type(eventvwr win32gui)
 
-add_importlibs(eventvwr user32 comctl32 advapi32 msvcrt)
+add_importlibs(eventvwr user32 comctl32 advapi32 msvcrt kernel32)
index 19304d5..15d5037 100644 (file)
@@ -29,4 +29,4 @@ add_pch(servman ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
 
 set_module_type(servman win32gui)
 
-add_importlibs(servman user32 gdi32 advapi32 version comctl32 shell32 comdlg32 msvcrt)
+add_importlibs(servman user32 gdi32 advapi32 version comctl32 shell32 comdlg32 msvcrt kernel32)
index 1ee8699..8bed8db 100644 (file)
@@ -29,4 +29,4 @@ add_pch(mstsc ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
 
 set_module_type(mstsc win32gui)
 
-add_importlibs(mstsc user32 gdi32 comctl32 ws2_32 advapi32 shell32 ole32 comdlg32 msvcrt)
+add_importlibs(mstsc user32 gdi32 comctl32 ws2_32 advapi32 shell32 ole32 comdlg32 msvcrt kernel32)
index 277cd52..6f02c2e 100644 (file)
@@ -9,6 +9,6 @@ add_subdirectory(netstat)
 add_subdirectory(nslookup)
 add_subdirectory(ping)
 #add_subdirectory(route)
-add_subdirectory(telnet)
+#add_subdirectory(telnet)
 add_subdirectory(tracert)
 #add_subdirectory(whois)
index 1945475..3805a59 100644 (file)
@@ -3,4 +3,4 @@ add_executable(arp arp.c arp.rc)
 
 set_module_type(arp win32cui)
 
-add_importlibs(arp iphlpapi ws2_32 shlwapi msvcrt)
+add_importlibs(arp iphlpapi ws2_32 shlwapi msvcrt kernel32)
index 3877a04..e6c4844 100644 (file)
@@ -7,4 +7,4 @@ set_module_type(dwnl win32cui)
 
 target_link_libraries(dwnl uuid)
 
-add_importlibs(dwnl urlmon wininet uuid msvcrt)
+add_importlibs(dwnl urlmon wininet msvcrt kernel32)
index f521a03..a2922b6 100644 (file)
@@ -9,4 +9,4 @@ add_executable(finger
 
 set_module_type(finger win32cui)
 
-add_importlibs(finger ws2_32 msvcrt)
+add_importlibs(finger ws2_32 msvcrt kernel32)
index 65414a8..a04e8d4 100644 (file)
@@ -10,4 +10,4 @@ add_executable(ftp
 
 set_module_type(ftp win32cui)
 
-add_importlibs(ftp ws2_32 iphlpapi msvcrt)
+add_importlibs(ftp ws2_32 iphlpapi msvcrt kernel32)
index 69c6fdb..0bdb4a3 100644 (file)
@@ -3,4 +3,4 @@ add_executable(ipconfig ipconfig.c ipconfig.rc)
 
 set_module_type(ipconfig win32cui)
 
-add_importlibs(ipconfig user32 iphlpapi advapi32 msvcrt)
+add_importlibs(ipconfig user32 iphlpapi advapi32 msvcrt kernel32)
index e9aa95f..413a05c 100644 (file)
@@ -12,4 +12,4 @@ add_executable(net ${SOURCE})
 
 set_module_type(net win32cui)
 
-add_importlibs(net ws2_32 msvcrt)
+add_importlibs(net ws2_32 msvcrt kernel32)
index c2d7f3e..b14d85d 100644 (file)
@@ -3,4 +3,4 @@ add_executable(netstat netstat.c netstat.rc)
 
 set_module_type(netstat win32cui)
 
-add_importlibs(netstat user32 ws2_32 snmpapi iphlpapi msvcrt)
+add_importlibs(netstat user32 ws2_32 snmpapi iphlpapi msvcrt kernel32)
index e3e27ff..f019fad 100644 (file)
@@ -6,4 +6,4 @@ add_executable(nslookup
 
 set_module_type(nslookup win32cui)
 
-add_importlibs(nslookup user32 ws2_32 snmpapi iphlpapi msvcrt)
+add_importlibs(nslookup user32 ws2_32 snmpapi iphlpapi msvcrt kernel32)
index 5b796bf..6fb1e80 100644 (file)
@@ -4,4 +4,4 @@ add_executable(ping ping.c ping.rc)
 
 set_module_type(ping win32cui)
 
-add_importlibs(ping ws2_32 msvcrt)
+add_importlibs(ping ws2_32 msvcrt kernel32)
index e26038c..0ff89e7 100644 (file)
@@ -4,4 +4,4 @@ set_unicode()
 add_executable(route route.c route.rc)
 
 set_module_type(route win32cui)
-add_importlibs(route ws2_32 iphlpapi msvcrt)
+add_importlibs(route ws2_32 iphlpapi msvcrt kernel32)
index 7ca9b8c..d381a5b 100644 (file)
@@ -26,4 +26,4 @@ target_link_libraries(telnet stlport)
 
 set_module_type(telnet win32cui)
 
-add_importlibs(telnet ws2_32 user32 msvcrt)
+add_importlibs(telnet ws2_32 user32 msvcrt kernel32)
index 9461a0f..a4dbe92 100644 (file)
@@ -4,4 +4,4 @@ add_executable(tracert tracert.c tracert.rc)
 
 set_module_type(tracert win32cui)
 
-add_importlibs(tracert ws2_32 msvcrt)
+add_importlibs(tracert ws2_32 msvcrt kernel32)
index bafd462..f94bcc9 100644 (file)
@@ -3,4 +3,4 @@ add_executable(whois whois.c whois.rc)
 
 set_module_type(whois win32cui)
 
-add_importlibs(whois ws2_32 msvcrt)
+add_importlibs(whois ws2_32 msvcrt kernel32)
index 8c3eacf..3622ac6 100644 (file)
@@ -18,4 +18,4 @@ add_executable(paint
 
 set_module_type(paint win32gui)
 
-add_importlibs(paint comdlg32 shell32 user32 gdi32 advapi32 comctl32 msvcrt)
+add_importlibs(paint comdlg32 shell32 user32 gdi32 advapi32 comctl32 msvcrt kernel32)
index 097ef22..cc5ce0f 100644 (file)
@@ -26,6 +26,6 @@ set_module_type(regedit win32gui)
 
 target_link_libraries(regedit uuid)
 
-add_importlibs(regedit user32 gdi32 advapi32 ole32 shell32 comctl32 comdlg32 shlwapi msvcrt)
+add_importlibs(regedit user32 gdi32 advapi32 ole32 shell32 comctl32 comdlg32 shlwapi msvcrt kernel32)
 
 #add_subdirectory(clb)
index 3680709..f1975ea 100644 (file)
@@ -5,4 +5,4 @@ add_executable(regedt32 regedt32.c resource.rc)
 
 set_module_type(regedt32 win32gui)
 
-add_importlibs(regedt32 shell32 shlwapi msvcrt)
+add_importlibs(regedt32 shell32 shlwapi msvcrt kernel32)
index 62c99de..7d67a09 100644 (file)
@@ -19,4 +19,4 @@ add_pch(sc ${CMAKE_CURRENT_SOURCE_DIR}/sc.h ${SOURCE})
 
 set_module_type(sc win32cui)
 
-add_importlibs(sc advapi32 msvcrt)
+add_importlibs(sc advapi32 msvcrt kernel32)
index 8315d88..e726379 100644 (file)
@@ -10,4 +10,4 @@ add_pch(shutdown ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
 
 set_module_type(shutdown win32cui)
 
-add_importlibs(shutdown advapi32 user32 msvcrt)
+add_importlibs(shutdown advapi32 user32 msvcrt kernel32)
index b2845bd..4ac9f49 100644 (file)
@@ -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)
+add_importlibs(sndvol32 user32 advapi32 gdi32 comctl32 shell32 winmm msvcrt kernel32)
index f9ca07a..81a6a63 100644 (file)
@@ -28,4 +28,4 @@ add_pch(taskmgr ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
 
 set_module_type(taskmgr win32gui)
 
-add_importlibs(taskmgr advapi32 user32 gdi32 shell32 comctl32 msvcrt)
+add_importlibs(taskmgr advapi32 user32 gdi32 shell32 comctl32 msvcrt kernel32 ntdll)
index ac59d1e..b98e439 100644 (file)
@@ -18,4 +18,4 @@ set_module_type(winhlp32 win32gui)
 
 target_link_libraries(winhlp32 wine)
 
-add_importlibs(winhlp32 user32 gdi32 shell32 comctl32 comdlg32 msvcrt)
+add_importlibs(winhlp32 user32 gdi32 shell32 comctl32 comdlg32 msvcrt kernel32)
index 8de258c..1b92d6c 100644 (file)
@@ -5,4 +5,4 @@ add_executable(winver winver.c)
 
 set_module_type(winver win32gui)
 
-add_importlibs(winver shell32 msvcrt)
+add_importlibs(winver shell32 msvcrt kernel32)
index fcf2ed4..e0ae8a0 100644 (file)
@@ -5,4 +5,4 @@ add_executable(write write.c rsrc.rc)
 
 set_module_type(write win32gui)
 
-add_importlibs(write user32 gdi32 msvcrt)
+add_importlibs(write user32 gdi32 msvcrt kernel32)
index dc06a56..9563884 100644 (file)
@@ -1,4 +1,4 @@
 
 add_subdirectory(cmd)
-add_subdirectory(explorer)
+#add_subdirectory(explorer)
 add_subdirectory(explorer-new)
index 1d5a99e..c4d0284 100644 (file)
@@ -12,5 +12,5 @@ target_link_libraries(olecli32
     ${CMAKE_CURRENT_BINARY_DIR}/olecli32.def
     wine)
 
-add_importlibs(oleacc ole32 gdi32 kernel32 ntdll)
+add_importlibs(olecli32 ole32 gdi32 kernel32 ntdll)
 add_dependencies(olecli32 olecli32_def psdk buildno_header)
index e51081a..b7abf56 100644 (file)
@@ -43,6 +43,9 @@ add_importlibs(shlwapi
     mlang
     urlmon
     winmm
-    version)
+    version
+    shell32
+    kernel32
+    ntdll)
 
 add_dependencies(shlwapi shlwapi_def)
index ef842a0..f71c21a 100644 (file)
@@ -1,18 +1,17 @@
 
 add_definitions(-DPC_NO_IMPORTS)
 
-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/sound)
-include_directories(${REACTOS_SOURCE_DIR}/drivers/wdm/audio/legacy/wdmaud)
-include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/libsamplerate)
+include_directories(
+    ${REACTOS_SOURCE_DIR}/include/reactos/libs/sound
+    ${REACTOS_SOURCE_DIR}/drivers/wdm/audio/legacy/wdmaud
+    ${REACTOS_SOURCE_DIR}/lib/3rdparty/libsamplerate)
 
 add_executable(audio_test audio_test.c)
 
 set_module_type(audio_test win32cui)
 
 target_link_libraries(audio_test
-    libsamplerate
-    mingw_main
-    mingw_common)
+    libsamplerate)
 
-add_importlibs(audio_test setupapi ksuser msvcrt)
-add_dependencies(audio_test psdk bugcodes)
+add_importlibs(audio_test setupapi ksuser msvcrt kernel32)
+add_dependencies(audio_test bugcodes)