diff --git a/reactos/base/applications/calc/CMakeLists.txt b/reactos/base/applications/calc/CMakeLists.txt index 85332bd76ea..04899dbeb80 100644 --- a/reactos/base/applications/calc/CMakeLists.txt +++ b/reactos/base/applications/calc/CMakeLists.txt @@ -10,6 +10,8 @@ list(APPEND SOURCE winmain.c calc.h) +file(GLOB calc_rc_deps res/*.*) +add_rc_deps(resource.rc ${calc_rc_deps}) add_executable(calc ${SOURCE} resource.rc) set_module_type(calc win32gui UNICODE) add_importlibs(calc advapi32 user32 gdi32 msvcrt kernel32) diff --git a/reactos/base/applications/charmap/CMakeLists.txt b/reactos/base/applications/charmap/CMakeLists.txt index 8baa1770d4f..e576b741e17 100644 --- a/reactos/base/applications/charmap/CMakeLists.txt +++ b/reactos/base/applications/charmap/CMakeLists.txt @@ -7,6 +7,7 @@ list(APPEND SOURCE settings.c precomp.h) +add_rc_deps(charmap.rc ${CMAKE_CURRENT_SOURCE_DIR}/res/charmap.ico) add_executable(charmap ${SOURCE} charmap.rc) set_module_type(charmap win32gui UNICODE) add_importlibs(charmap advapi32 user32 gdi32 comctl32 msvcrt kernel32) diff --git a/reactos/base/applications/control/CMakeLists.txt b/reactos/base/applications/control/CMakeLists.txt index 0818fce4aee..06e49c19229 100644 --- a/reactos/base/applications/control/CMakeLists.txt +++ b/reactos/base/applications/control/CMakeLists.txt @@ -1,4 +1,5 @@ +add_rc_deps(control.rc ${CMAKE_CURRENT_SOURCE_DIR}/resources/config.ico) add_executable(control control.c control.rc) set_module_type(control win32gui UNICODE) add_importlibs(control advapi32 shell32 user32 msvcrt kernel32) diff --git a/reactos/base/applications/dxdiag/CMakeLists.txt b/reactos/base/applications/dxdiag/CMakeLists.txt index f75b1210c03..fbcaff538ea 100644 --- a/reactos/base/applications/dxdiag/CMakeLists.txt +++ b/reactos/base/applications/dxdiag/CMakeLists.txt @@ -15,6 +15,7 @@ list(APPEND SOURCE d3dtest9.c precomp.h) +add_rc_deps(dxdiag.rc ${CMAKE_CURRENT_SOURCE_DIR}/res/dxdiag.ico) add_executable(dxdiag ${SOURCE} dxdiag.rc) set_module_type(dxdiag win32gui UNICODE) target_link_libraries(dxdiag dxguid) diff --git a/reactos/base/applications/fontview/CMakeLists.txt b/reactos/base/applications/fontview/CMakeLists.txt index 53b55f8532c..5758d49f73f 100644 --- a/reactos/base/applications/fontview/CMakeLists.txt +++ b/reactos/base/applications/fontview/CMakeLists.txt @@ -4,6 +4,7 @@ list(APPEND SOURCE fontview.c precomp.h) +add_rc_deps(fontview.rc ${CMAKE_CURRENT_SOURCE_DIR}/ttf.ico) add_executable(fontview ${SOURCE} fontview.rc) set_module_type(fontview win32gui) add_importlibs(fontview comdlg32 gdi32 shell32 user32 msvcrt kernel32) diff --git a/reactos/base/applications/games/solitaire/CMakeLists.txt b/reactos/base/applications/games/solitaire/CMakeLists.txt index 552812129b5..23f34283110 100644 --- a/reactos/base/applications/games/solitaire/CMakeLists.txt +++ b/reactos/base/applications/games/solitaire/CMakeLists.txt @@ -8,6 +8,7 @@ list(APPEND SOURCE solitaire.cpp solitaire.h) +add_rc_deps(rsrc.rc ${CMAKE_CURRENT_SOURCE_DIR}/solitaire.ico) add_executable(sol ${SOURCE} rsrc.rc) target_link_libraries(sol cardlib) set_module_type(sol win32gui UNICODE) diff --git a/reactos/base/applications/games/spider/CMakeLists.txt b/reactos/base/applications/games/spider/CMakeLists.txt index a74233e4545..a036f0e1f39 100644 --- a/reactos/base/applications/games/spider/CMakeLists.txt +++ b/reactos/base/applications/games/spider/CMakeLists.txt @@ -10,6 +10,7 @@ list(APPEND SOURCE spigame.cpp spider.h) +add_rc_deps(rsrc.rc ${CMAKE_CURRENT_SOURCE_DIR}/spider.ico) add_executable(spider ${SOURCE} rsrc.rc) target_link_libraries(spider cardlib) add_pch(spider spider.h SOURCE) diff --git a/reactos/base/applications/games/winmine/CMakeLists.txt b/reactos/base/applications/games/winmine/CMakeLists.txt index 30cdd66e93c..f32befc6320 100644 --- a/reactos/base/applications/games/winmine/CMakeLists.txt +++ b/reactos/base/applications/games/winmine/CMakeLists.txt @@ -6,6 +6,8 @@ list(APPEND SOURCE dialog.c main.h) +file(GLOB winmine_rc_deps rc/*.*) +add_rc_deps(rsrc.rc ${winmine_rc_deps}) add_executable(winmine ${SOURCE} rsrc.rc) set_module_type(winmine win32gui UNICODE) target_link_libraries(winmine wine) diff --git a/reactos/base/applications/hh/CMakeLists.txt b/reactos/base/applications/hh/CMakeLists.txt index 451d84ee422..44c16242f04 100644 --- a/reactos/base/applications/hh/CMakeLists.txt +++ b/reactos/base/applications/hh/CMakeLists.txt @@ -1,4 +1,5 @@ +add_rc_deps(hh.rc ${CMAKE_CURRENT_SOURCE_DIR}/hh.ico) add_executable(hh main.c hh.rc) set_module_type(hh win32gui) add_importlibs(hh gdi32 user32 msvcrt kernel32) diff --git a/reactos/base/applications/iexplore/CMakeLists.txt b/reactos/base/applications/iexplore/CMakeLists.txt index 540c1b7f0f5..ed834e4e8d2 100644 --- a/reactos/base/applications/iexplore/CMakeLists.txt +++ b/reactos/base/applications/iexplore/CMakeLists.txt @@ -1,4 +1,5 @@ +add_rc_deps(iexplore.rc ${CMAKE_CURRENT_SOURCE_DIR}/iexplore.ico) add_executable(iexplore main.c iexplore.rc) target_link_libraries(iexplore wine) set_module_type(iexplore win32gui UNICODE) diff --git a/reactos/base/applications/kbswitch/CMakeLists.txt b/reactos/base/applications/kbswitch/CMakeLists.txt index 23d7831a200..2b735411437 100644 --- a/reactos/base/applications/kbswitch/CMakeLists.txt +++ b/reactos/base/applications/kbswitch/CMakeLists.txt @@ -1,4 +1,5 @@ +add_rc_deps(kbswitch.rc ${CMAKE_CURRENT_SOURCE_DIR}/res/kbswitch.ico) add_executable(kbswitch kbswitch.c kbswitch.rc) set_module_type(kbswitch win32gui UNICODE) add_importlibs(kbswitch advapi32 user32 shell32 gdi32 msvcrt kernel32) diff --git a/reactos/base/applications/magnify/CMakeLists.txt b/reactos/base/applications/magnify/CMakeLists.txt index 0db7137c41a..ee7919e948c 100644 --- a/reactos/base/applications/magnify/CMakeLists.txt +++ b/reactos/base/applications/magnify/CMakeLists.txt @@ -4,6 +4,7 @@ list(APPEND SOURCE settings.c magnifier.h) +add_rc_deps(magnify.rc ${CMAKE_CURRENT_SOURCE_DIR}/res/magnify.ico) add_executable(magnify ${SOURCE} magnify.rc) set_module_type(magnify win32gui) add_importlibs(magnify user32 gdi32 advapi32 shell32 msvcrt kernel32) diff --git a/reactos/base/applications/mmc/CMakeLists.txt b/reactos/base/applications/mmc/CMakeLists.txt index cad6e4d1ddb..77320990a45 100644 --- a/reactos/base/applications/mmc/CMakeLists.txt +++ b/reactos/base/applications/mmc/CMakeLists.txt @@ -5,6 +5,7 @@ list(APPEND SOURCE mmc.c precomp.h) +add_rc_deps(mmc.rc ${CMAKE_CURRENT_SOURCE_DIR}/resources/mmc.ico) add_executable(mmcclient ${SOURCE} mmc.rc) set_module_type(mmcclient win32gui UNICODE) add_importlibs(mmcclient user32 gdi32 comdlg32 advapi32 shell32 comctl32 msvcrt kernel32) diff --git a/reactos/base/applications/mplay32/CMakeLists.txt b/reactos/base/applications/mplay32/CMakeLists.txt index de54a0e0557..7bda69f95ce 100644 --- a/reactos/base/applications/mplay32/CMakeLists.txt +++ b/reactos/base/applications/mplay32/CMakeLists.txt @@ -1,4 +1,6 @@ +file(GLOB mplay32_rc_deps resources/*.*) +add_rc_deps(mplay32.rc ${mplay32_rc_deps}) add_executable(mplay32 mplay32.c mplay32.rc) set_module_type(mplay32 win32gui UNICODE) add_importlibs(mplay32 advapi32 comctl32 comdlg32 user32 gdi32 winmm shell32 msvcrt kernel32) diff --git a/reactos/base/applications/msconfig/CMakeLists.txt b/reactos/base/applications/msconfig/CMakeLists.txt index 77f652bcd6f..62e4b786245 100644 --- a/reactos/base/applications/msconfig/CMakeLists.txt +++ b/reactos/base/applications/msconfig/CMakeLists.txt @@ -9,6 +9,7 @@ list(APPEND SOURCE msconfig.c precomp.h) +add_rc_deps(msconfig.rc ${CMAKE_CURRENT_SOURCE_DIR}/res/msconfig.ico) add_executable(msconfig ${SOURCE} msconfig.rc) set_module_type(msconfig win32gui UNICODE) add_importlibs(msconfig user32 advapi32 version comctl32 shell32 shlwapi msvcrt kernel32) diff --git a/reactos/base/applications/mscutils/devmgmt/CMakeLists.txt b/reactos/base/applications/mscutils/devmgmt/CMakeLists.txt index 2c4c0ac7ce9..47cf226f13e 100644 --- a/reactos/base/applications/mscutils/devmgmt/CMakeLists.txt +++ b/reactos/base/applications/mscutils/devmgmt/CMakeLists.txt @@ -7,6 +7,8 @@ list(APPEND SOURCE misc.c precomp.h) +file(GLOB devmgmt_rc_deps res/*.*) +add_rc_deps(devmgmt.rc ${devmgmt_rc_deps}) add_executable(devmgmt ${SOURCE} devmgmt.rc) set_module_type(devmgmt win32gui UNICODE) add_importlibs(devmgmt setupapi gdi32 user32 comctl32 advapi32 devmgr msvcrt kernel32) diff --git a/reactos/base/applications/mscutils/eventvwr/CMakeLists.txt b/reactos/base/applications/mscutils/eventvwr/CMakeLists.txt index 911f446555f..899204c07e8 100644 --- a/reactos/base/applications/mscutils/eventvwr/CMakeLists.txt +++ b/reactos/base/applications/mscutils/eventvwr/CMakeLists.txt @@ -1,4 +1,6 @@ +file(GLOB eventvwr_rc_deps res/*.*) +add_rc_deps(eventvwr.rc ${eventvwr_rc_deps}) add_executable(eventvwr eventvwr.c eventvwr.rc) set_module_type(eventvwr win32gui UNICODE) add_importlibs(eventvwr user32 comctl32 comdlg32 advapi32 msvcrt kernel32) diff --git a/reactos/base/applications/mspaint/CMakeLists.txt b/reactos/base/applications/mspaint/CMakeLists.txt index d5ac4d49b15..3469a8c95e1 100644 --- a/reactos/base/applications/mspaint/CMakeLists.txt +++ b/reactos/base/applications/mspaint/CMakeLists.txt @@ -16,6 +16,8 @@ list(APPEND SOURCE winproc.c precomp.h) +file(GLOB mspaint_rc_deps icons/*.*) +add_rc_deps(rsrc.rc ${mspaint_rc_deps}) add_executable(mspaint ${SOURCE} rsrc.rc) set_module_type(mspaint win32gui UNICODE) add_importlibs(mspaint hhctrl comdlg32 shell32 user32 gdi32 advapi32 comctl32 msvcrt kernel32) diff --git a/reactos/base/applications/mspaint_new/CMakeLists.txt b/reactos/base/applications/mspaint_new/CMakeLists.txt index c6674a64fb3..4fc6ccfbe7c 100644 --- a/reactos/base/applications/mspaint_new/CMakeLists.txt +++ b/reactos/base/applications/mspaint_new/CMakeLists.txt @@ -21,6 +21,8 @@ list(APPEND SOURCE winproc.cpp precomp.h) +file(GLOB mspaint_new_rc_deps icons/*.*) +add_rc_deps(rsrc.rc ${mspaint_new_rc_deps}) add_executable(mspaint_new ${SOURCE} rsrc.rc) set_module_type(mspaint_new win32gui UNICODE) add_importlibs(mspaint_new hhctrl comdlg32 shell32 user32 gdi32 advapi32 comctl32 msvcrt kernel32) diff --git a/reactos/base/applications/mstsc/CMakeLists.txt b/reactos/base/applications/mstsc/CMakeLists.txt index 5a335467e0a..78de36276b0 100644 --- a/reactos/base/applications/mstsc/CMakeLists.txt +++ b/reactos/base/applications/mstsc/CMakeLists.txt @@ -30,6 +30,8 @@ list(APPEND SOURCE uimain.h precomp.h) +file(GLOB mstsc_rc_deps res/*.*) +add_rc_deps(rdc.rc ${mstsc_rc_deps}) add_executable(mstsc ${SOURCE} rdc.rc) set_module_type(mstsc win32gui UNICODE) add_importlibs(mstsc user32 gdi32 comctl32 ws2_32 advapi32 shell32 ole32 comdlg32 msvcrt kernel32) diff --git a/reactos/base/applications/notepad/CMakeLists.txt b/reactos/base/applications/notepad/CMakeLists.txt index 14b428d1d21..1674d83151b 100644 --- a/reactos/base/applications/notepad/CMakeLists.txt +++ b/reactos/base/applications/notepad/CMakeLists.txt @@ -6,6 +6,7 @@ list(APPEND SOURCE text.c notepad.h) +add_rc_deps(rsrc.rc ${CMAKE_CURRENT_SOURCE_DIR}/res/notepad.ico) add_executable(notepad ${SOURCE} rsrc.rc) set_module_type(notepad win32gui UNICODE) add_importlibs(notepad user32 gdi32 comctl32 comdlg32 advapi32 shell32 msvcrt kernel32) diff --git a/reactos/base/applications/osk/CMakeLists.txt b/reactos/base/applications/osk/CMakeLists.txt index 654136255a9..a6451ea2273 100644 --- a/reactos/base/applications/osk/CMakeLists.txt +++ b/reactos/base/applications/osk/CMakeLists.txt @@ -1,4 +1,6 @@ +file(GLOB osk_rc_deps res/*.*) +add_rc_deps(rsrc.rc ${osk_rc_deps}) add_executable(osk main.c rsrc.rc) set_module_type(osk win32gui UNICODE) add_importlibs(osk comdlg32 shell32 user32 gdi32 advapi32 comctl32 msvcrt kernel32) diff --git a/reactos/base/applications/rapps/CMakeLists.txt b/reactos/base/applications/rapps/CMakeLists.txt index 25d0bd176c4..4b00ada21ee 100644 --- a/reactos/base/applications/rapps/CMakeLists.txt +++ b/reactos/base/applications/rapps/CMakeLists.txt @@ -16,6 +16,8 @@ list(APPEND SOURCE winmain.c rapps.h) +file(GLOB_RECURSE rapps_rc_deps res/*.*) +add_rc_deps(rapps.rc ${rapps_rc_deps}) add_executable(rapps ${SOURCE} rapps.rc) set_module_type(rapps win32gui UNICODE) target_link_libraries(rapps uuid) diff --git a/reactos/base/applications/rapps_new/CMakeLists.txt b/reactos/base/applications/rapps_new/CMakeLists.txt index e004f93d813..37718158857 100644 --- a/reactos/base/applications/rapps_new/CMakeLists.txt +++ b/reactos/base/applications/rapps_new/CMakeLists.txt @@ -16,6 +16,8 @@ list(APPEND SOURCE winmain.cpp rapps.h) +file(GLOB_RECURSE rapps_new_rc_deps res/*.*) +add_rc_deps(rapps.rc ${rapps_new_rc_deps}) add_executable(rapps_new ${SOURCE} rapps.rc) set_module_type(rapps_new win32gui UNICODE) target_link_libraries(rapps_new atlnew uuid wine) diff --git a/reactos/base/applications/regedit/CMakeLists.txt b/reactos/base/applications/regedit/CMakeLists.txt index d97079a7026..aef9690d53f 100644 --- a/reactos/base/applications/regedit/CMakeLists.txt +++ b/reactos/base/applications/regedit/CMakeLists.txt @@ -18,6 +18,8 @@ list(APPEND SOURCE treeview.c regedit.h) +file(GLOB regedit_rc_deps res/*.*) +add_rc_deps(regedit.rc ${regedit_rc_deps}) add_executable(regedit ${SOURCE} regedit.rc) set_module_type(regedit win32gui UNICODE) target_link_libraries(regedit uuid) diff --git a/reactos/base/applications/regedt32/CMakeLists.txt b/reactos/base/applications/regedt32/CMakeLists.txt index 4a65a2919c3..419eb91427f 100644 --- a/reactos/base/applications/regedt32/CMakeLists.txt +++ b/reactos/base/applications/regedt32/CMakeLists.txt @@ -1,4 +1,5 @@ +add_rc_deps(resource.rc ${CMAKE_CURRENT_SOURCE_DIR}/res/regedt32.ico) add_executable(regedt32 regedt32.c resource.rc) set_module_type(regedt32 win32gui UNICODE) add_importlibs(regedt32 shell32 shlwapi msvcrt kernel32) diff --git a/reactos/base/applications/screensavers/3dtext/CMakeLists.txt b/reactos/base/applications/screensavers/3dtext/CMakeLists.txt index 237e8d4bbfd..8258dba1a84 100644 --- a/reactos/base/applications/screensavers/3dtext/CMakeLists.txt +++ b/reactos/base/applications/screensavers/3dtext/CMakeLists.txt @@ -4,6 +4,7 @@ list(APPEND SOURCE settings.c 3dtext.h) +add_rc_deps(rsrc.rc ${CMAKE_CURRENT_SOURCE_DIR}/res/icon_3dtext.ico) add_executable(3dtext ${SOURCE} rsrc.rc) set_module_type(3dtext win32gui UNICODE) set_target_properties(3dtext PROPERTIES SUFFIX ".scr") diff --git a/reactos/base/applications/screensavers/logon/CMakeLists.txt b/reactos/base/applications/screensavers/logon/CMakeLists.txt index c13e506a6d4..7d1dbc794d2 100644 --- a/reactos/base/applications/screensavers/logon/CMakeLists.txt +++ b/reactos/base/applications/screensavers/logon/CMakeLists.txt @@ -1,4 +1,6 @@ +file(GLOB logon_rc_deps res/*.*) +add_rc_deps(logon.rc ${logon_rc_deps}) add_executable(logon logon.c logon.rc) set_module_type(logon win32gui UNICODE) set_target_properties(logon PROPERTIES SUFFIX ".scr") diff --git a/reactos/base/applications/sndrec32/CMakeLists.txt b/reactos/base/applications/sndrec32/CMakeLists.txt index 1319008d8ad..83809d2d480 100644 --- a/reactos/base/applications/sndrec32/CMakeLists.txt +++ b/reactos/base/applications/sndrec32/CMakeLists.txt @@ -12,6 +12,8 @@ list(APPEND SOURCE sndrec32.cpp stdafx.h) +file(GLOB sndrec32_rc_deps resources/*.*) +add_rc_deps(rsrc.rc ${sndrec32_rc_deps}) add_executable(sndrec32 ${SOURCE} rsrc.rc) set_module_type(sndrec32 win32gui UNICODE) add_importlibs(sndrec32 winmm user32 msacm32 comctl32 comdlg32 gdi32 shell32 msvcrt kernel32) diff --git a/reactos/base/applications/sndvol32/CMakeLists.txt b/reactos/base/applications/sndvol32/CMakeLists.txt index 72fb422b0f0..3d97d129de1 100644 --- a/reactos/base/applications/sndvol32/CMakeLists.txt +++ b/reactos/base/applications/sndvol32/CMakeLists.txt @@ -6,6 +6,7 @@ list(APPEND SOURCE sndvol32.c sndvol32.h) +add_rc_deps(sndvol32.rc ${CMAKE_CURRENT_SOURCE_DIR}/resources/sndvol32.ico) add_executable(sndvol32 ${SOURCE} sndvol32.rc) set_module_type(sndvol32 win32gui UNICODE) add_importlibs(sndvol32 user32 advapi32 gdi32 comctl32 shell32 winmm msvcrt kernel32 ntdll) diff --git a/reactos/base/applications/taskmgr/CMakeLists.txt b/reactos/base/applications/taskmgr/CMakeLists.txt index 68bae6c0ad1..4cfba9ffb0a 100644 --- a/reactos/base/applications/taskmgr/CMakeLists.txt +++ b/reactos/base/applications/taskmgr/CMakeLists.txt @@ -21,6 +21,8 @@ list(APPEND SOURCE trayicon.c precomp.h) +file(GLOB taskmgr_rc_deps res/*.*) +add_rc_deps(taskmgr.rc ${taskmgr_rc_deps}) add_executable(taskmgr ${SOURCE} taskmgr.rc) set_module_type(taskmgr win32gui UNICODE) add_importlibs(taskmgr advapi32 user32 gdi32 shell32 shlwapi comctl32 msvcrt kernel32 ntdll) diff --git a/reactos/base/applications/winhlp32/CMakeLists.txt b/reactos/base/applications/winhlp32/CMakeLists.txt index 9cecac835c6..a7b5258c6c2 100644 --- a/reactos/base/applications/winhlp32/CMakeLists.txt +++ b/reactos/base/applications/winhlp32/CMakeLists.txt @@ -15,11 +15,8 @@ list(APPEND SOURCE winhelp.c winhelp.h) -add_executable(winhlp32 - ${SOURCE} - string.c - rsrc.rc) - +add_rc_deps(rsrc.rc ${CMAKE_CURRENT_SOURCE_DIR}/res/winhelp.ico) +add_executable(winhlp32 ${SOURCE} string.c rsrc.rc) set_module_type(winhlp32 win32gui) target_link_libraries(winhlp32 wine) add_importlibs(winhlp32 user32 gdi32 shell32 comctl32 comdlg32 msvcrt kernel32 ntdll) diff --git a/reactos/base/applications/wordpad/CMakeLists.txt b/reactos/base/applications/wordpad/CMakeLists.txt index 4a1c36e54f4..9a6848c177a 100644 --- a/reactos/base/applications/wordpad/CMakeLists.txt +++ b/reactos/base/applications/wordpad/CMakeLists.txt @@ -8,10 +8,11 @@ list(APPEND SOURCE olecallback.c print.c registry.c - wordpad.c - rsrc.rc) + wordpad.c) -add_executable(wordpad ${SOURCE}) +file(GLOB wordpad_rc_deps res/*.*) +add_rc_deps(rsrc.rc ${wordpad_rc_deps}) +add_executable(wordpad ${SOURCE} rsrc.rc) set_module_type(wordpad win32gui) target_link_libraries(wordpad wine uuid) add_importlibs(wordpad comdlg32 ole32 shell32 user32 gdi32 advapi32 comctl32 msvcrt kernel32 ntdll)