diff --git a/reactos/base/applications/cacls/CMakeLists.txt b/reactos/base/applications/cacls/CMakeLists.txt index 575d4beb29a..aa9f30858d4 100644 --- a/reactos/base/applications/cacls/CMakeLists.txt +++ b/reactos/base/applications/cacls/CMakeLists.txt @@ -1,10 +1,6 @@ -set_rc_compiler() - list(APPEND SOURCE cacls.c cacls.rc) - add_executable(cacls ${SOURCE}) - set_module_type(cacls win32cui UNICODE) add_importlibs(cacls advapi32 user32 shell32 msvcrt kernel32) add_cd_file(TARGET cacls DESTINATION reactos/system32 FOR all) diff --git a/reactos/base/applications/calc/CMakeLists.txt b/reactos/base/applications/calc/CMakeLists.txt index 956959da79e..d187356c2de 100644 --- a/reactos/base/applications/calc/CMakeLists.txt +++ b/reactos/base/applications/calc/CMakeLists.txt @@ -1,6 +1,4 @@ -set_rc_compiler() - add_definitions(-DDISABLE_HTMLHELP_SUPPORT=1) add_executable(calc @@ -15,7 +13,7 @@ add_executable(calc set_module_type(calc win32gui UNICODE) add_importlibs(calc advapi32 user32 gdi32 msvcrt kernel32) if(MSVC) -add_importlibs(calc ntdll) + add_importlibs(calc ntdll) endif() add_pch(calc calc.h) add_cd_file(TARGET calc DESTINATION reactos/system32 FOR all) diff --git a/reactos/base/applications/charmap/CMakeLists.txt b/reactos/base/applications/charmap/CMakeLists.txt index cb3878b6c18..9921e8252e8 100644 --- a/reactos/base/applications/charmap/CMakeLists.txt +++ b/reactos/base/applications/charmap/CMakeLists.txt @@ -1,6 +1,4 @@ -set_rc_compiler() - list(APPEND SOURCE about.c charmap.c @@ -10,11 +8,7 @@ list(APPEND SOURCE charmap.rc) add_executable(charmap ${SOURCE}) - set_module_type(charmap win32gui UNICODE) - add_importlibs(charmap advapi32 user32 gdi32 comctl32 msvcrt kernel32) - add_pch(charmap precomp.h) - add_cd_file(TARGET charmap DESTINATION reactos/system32 FOR all) diff --git a/reactos/base/applications/cmdutils/doskey/CMakeLists.txt b/reactos/base/applications/cmdutils/doskey/CMakeLists.txt index fc8aa68f73d..2dca08987c5 100644 --- a/reactos/base/applications/cmdutils/doskey/CMakeLists.txt +++ b/reactos/base/applications/cmdutils/doskey/CMakeLists.txt @@ -1,8 +1,5 @@ -set_rc_compiler() - add_executable(doskey doskey.c doskey.rc) - set_module_type(doskey win32cui UNICODE) add_importlibs(doskey user32 msvcrt kernel32) add_cd_file(TARGET doskey DESTINATION reactos/system32 FOR all) diff --git a/reactos/base/applications/cmdutils/find/CMakeLists.txt b/reactos/base/applications/cmdutils/find/CMakeLists.txt index 6f1d5b856c7..7431f5e17f6 100644 --- a/reactos/base/applications/cmdutils/find/CMakeLists.txt +++ b/reactos/base/applications/cmdutils/find/CMakeLists.txt @@ -1,8 +1,5 @@ -set_rc_compiler() - add_executable(find find.c find.rc) - set_module_type(find win32cui) add_importlibs(find user32 msvcrt kernel32) add_cd_file(TARGET find DESTINATION reactos/system32 FOR all) diff --git a/reactos/base/applications/cmdutils/more/CMakeLists.txt b/reactos/base/applications/cmdutils/more/CMakeLists.txt index 251d0fc3c6f..f3d49efd5cc 100644 --- a/reactos/base/applications/cmdutils/more/CMakeLists.txt +++ b/reactos/base/applications/cmdutils/more/CMakeLists.txt @@ -1,8 +1,5 @@ -set_rc_compiler() - add_executable(more more.c more.rc) - set_module_type(more win32cui) add_importlibs(more user32 msvcrt kernel32) add_cd_file(TARGET more DESTINATION reactos/system32 FOR all) diff --git a/reactos/base/applications/cmdutils/reg/CMakeLists.txt b/reactos/base/applications/cmdutils/reg/CMakeLists.txt index 1b1d22161a4..a6833f9a77c 100644 --- a/reactos/base/applications/cmdutils/reg/CMakeLists.txt +++ b/reactos/base/applications/cmdutils/reg/CMakeLists.txt @@ -1,11 +1,8 @@ -set_rc_compiler() - remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) add_executable(reg reg.c reg.rc) - set_module_type(reg win32cui UNICODE) add_importlibs(reg advapi32 user32 msvcrt kernel32) add_cd_file(TARGET reg DESTINATION reactos/system32 FOR all) diff --git a/reactos/base/applications/cmdutils/xcopy/CMakeLists.txt b/reactos/base/applications/cmdutils/xcopy/CMakeLists.txt index 31813bbe7c0..9da3aa6a26c 100644 --- a/reactos/base/applications/cmdutils/xcopy/CMakeLists.txt +++ b/reactos/base/applications/cmdutils/xcopy/CMakeLists.txt @@ -1,8 +1,5 @@ -set_rc_compiler() - add_executable(xcopy xcopy.c rsrc.rc) - target_link_libraries(xcopy wine) set_module_type(xcopy win32cui UNICODE) add_importlibs(xcopy shell32 user32 msvcrt kernel32 ntdll) diff --git a/reactos/base/applications/control/CMakeLists.txt b/reactos/base/applications/control/CMakeLists.txt index 54e90d66419..7f74b8ef81e 100644 --- a/reactos/base/applications/control/CMakeLists.txt +++ b/reactos/base/applications/control/CMakeLists.txt @@ -1,8 +1,5 @@ -set_rc_compiler() - add_executable(control control.c control.rc) - set_module_type(control win32gui UNICODE) add_importlibs(control advapi32 shell32 msvcrt kernel32) add_cd_file(TARGET control DESTINATION reactos/system32 FOR all) diff --git a/reactos/base/applications/dxdiag/CMakeLists.txt b/reactos/base/applications/dxdiag/CMakeLists.txt index 3cf93b3bad6..a9d92d80391 100644 --- a/reactos/base/applications/dxdiag/CMakeLists.txt +++ b/reactos/base/applications/dxdiag/CMakeLists.txt @@ -1,6 +1,4 @@ -set_rc_compiler() - list(APPEND SOURCE system.c display.c @@ -18,13 +16,8 @@ list(APPEND SOURCE d3dtest9.c) add_executable(dxdiag ${SOURCE}) - set_module_type(dxdiag win32gui UNICODE) - target_link_libraries(dxdiag dxguid) - add_importlibs(dxdiag user32 advapi32 comctl32 dinput8 setupapi dsound ddraw version gdi32 winmm d3d9 msvcrt kernel32 ntdll) - add_pch(dxdiag precomp.h) - add_cd_file(TARGET dxdiag DESTINATION reactos/system32 FOR all) diff --git a/reactos/base/applications/findstr/CMakeLists.txt b/reactos/base/applications/findstr/CMakeLists.txt index fd9798e1e11..6eb3c72a925 100644 --- a/reactos/base/applications/findstr/CMakeLists.txt +++ b/reactos/base/applications/findstr/CMakeLists.txt @@ -1,8 +1,5 @@ -set_rc_compiler() - add_executable(findstr findstr.c findstr.rc) - set_module_type(findstr win32cui) add_importlibs(findstr user32 msvcrt kernel32) add_cd_file(TARGET findstr DESTINATION reactos/system32 FOR all) diff --git a/reactos/base/applications/fontview/CMakeLists.txt b/reactos/base/applications/fontview/CMakeLists.txt index 59765eb1bcc..0b6d921e466 100644 --- a/reactos/base/applications/fontview/CMakeLists.txt +++ b/reactos/base/applications/fontview/CMakeLists.txt @@ -1,5 +1,4 @@ -set_rc_compiler() add_executable(fontview display.c fontview.c @@ -7,5 +6,4 @@ add_executable(fontview set_module_type(fontview win32gui) add_importlibs(fontview comdlg32 gdi32 shell32 user32 msvcrt kernel32) - add_cd_file(TARGET fontview DESTINATION reactos/system32 FOR all) diff --git a/reactos/base/applications/games/solitaire/CMakeLists.txt b/reactos/base/applications/games/solitaire/CMakeLists.txt index 60ac7d46db2..b91c58405fa 100644 --- a/reactos/base/applications/games/solitaire/CMakeLists.txt +++ b/reactos/base/applications/games/solitaire/CMakeLists.txt @@ -1,6 +1,5 @@ set_cpp() -set_rc_compiler() include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/cardlib) diff --git a/reactos/base/applications/games/spider/CMakeLists.txt b/reactos/base/applications/games/spider/CMakeLists.txt index 4247770fa00..526e4017025 100644 --- a/reactos/base/applications/games/spider/CMakeLists.txt +++ b/reactos/base/applications/games/spider/CMakeLists.txt @@ -3,8 +3,6 @@ set_cpp() include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/cardlib ${CMAKE_CURRENT_SOURCE_DIR}) -set_rc_compiler() - add_executable(spider spider.cpp spigame.cpp diff --git a/reactos/base/applications/games/winmine/CMakeLists.txt b/reactos/base/applications/games/winmine/CMakeLists.txt index f4e99a16789..9e0eeee3936 100644 --- a/reactos/base/applications/games/winmine/CMakeLists.txt +++ b/reactos/base/applications/games/winmine/CMakeLists.txt @@ -1,8 +1,6 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}) -set_rc_compiler() - add_executable(winmine main.c dialog.c @@ -11,5 +9,4 @@ add_executable(winmine set_module_type(winmine win32gui) target_link_libraries(winmine wine) add_importlibs(winmine user32 gdi32 advapi32 shell32 msvcrt kernel32 ntdll) - add_cd_file(TARGET winmine DESTINATION reactos/system32 FOR all) diff --git a/reactos/base/applications/hh/CMakeLists.txt b/reactos/base/applications/hh/CMakeLists.txt index 5de0b1a0282..451d84ee422 100644 --- a/reactos/base/applications/hh/CMakeLists.txt +++ b/reactos/base/applications/hh/CMakeLists.txt @@ -1,5 +1,4 @@ -set_rc_compiler() 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 b86174114db..bceb4aedd14 100644 --- a/reactos/base/applications/iexplore/CMakeLists.txt +++ b/reactos/base/applications/iexplore/CMakeLists.txt @@ -1,5 +1,4 @@ -set_rc_compiler() add_executable(iexplore main.c iexplore.rc) set_module_type(iexplore win32gui) add_importlibs(iexplore shdocvw msvcrt kernel32) diff --git a/reactos/base/applications/kbswitch/CMakeLists.txt b/reactos/base/applications/kbswitch/CMakeLists.txt index 630744b475a..6fe41a541c7 100644 --- a/reactos/base/applications/kbswitch/CMakeLists.txt +++ b/reactos/base/applications/kbswitch/CMakeLists.txt @@ -1,10 +1,6 @@ -set_rc_compiler() - add_executable(kbswitch kbswitch.c kbswitch.rc) - set_module_type(kbswitch win32gui UNICODE) add_importlibs(kbswitch advapi32 user32 shell32 gdi32 msvcrt kernel32) - add_cd_file(TARGET kbswitch DESTINATION reactos/system32 FOR all) add_subdirectory(kbsdll) diff --git a/reactos/base/applications/logoff/CMakeLists.txt b/reactos/base/applications/logoff/CMakeLists.txt index 7a7180eb4c3..8be27725ec0 100644 --- a/reactos/base/applications/logoff/CMakeLists.txt +++ b/reactos/base/applications/logoff/CMakeLists.txt @@ -1,13 +1,10 @@ -set_rc_compiler() - list(APPEND SOURCE misc.c logoff.c logoff.rc) add_executable(logoff ${SOURCE}) - set_module_type(logoff win32cui) add_importlibs(logoff advapi32 user32 msvcrt kernel32) add_pch(logoff precomp.h) diff --git a/reactos/base/applications/magnify/CMakeLists.txt b/reactos/base/applications/magnify/CMakeLists.txt index 5fef7d5444d..43195c63c40 100644 --- a/reactos/base/applications/magnify/CMakeLists.txt +++ b/reactos/base/applications/magnify/CMakeLists.txt @@ -1,6 +1,4 @@ -set_rc_compiler() - add_executable(magnify magnifier.c settings.c diff --git a/reactos/base/applications/mmc/CMakeLists.txt b/reactos/base/applications/mmc/CMakeLists.txt index 0d50e53da50..387d4e3e87c 100644 --- a/reactos/base/applications/mmc/CMakeLists.txt +++ b/reactos/base/applications/mmc/CMakeLists.txt @@ -1,6 +1,4 @@ -set_rc_compiler() - list(APPEND SOURCE console.c misc.c @@ -8,7 +6,6 @@ list(APPEND SOURCE mmc.rc) add_executable(mmcclient ${SOURCE}) - set_module_type(mmcclient win32gui UNICODE) add_importlibs(mmcclient user32 gdi32 comdlg32 advapi32 shell32 comctl32 msvcrt kernel32) add_pch(mmcclient precomp.h) diff --git a/reactos/base/applications/mplay32/CMakeLists.txt b/reactos/base/applications/mplay32/CMakeLists.txt index 421fc6cbfe6..de54a0e0557 100644 --- a/reactos/base/applications/mplay32/CMakeLists.txt +++ b/reactos/base/applications/mplay32/CMakeLists.txt @@ -1,8 +1,5 @@ -set_rc_compiler() - 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) add_cd_file(TARGET mplay32 DESTINATION reactos/system32 FOR all) diff --git a/reactos/base/applications/msconfig/CMakeLists.txt b/reactos/base/applications/msconfig/CMakeLists.txt index 22017daab06..f80a7d625e0 100644 --- a/reactos/base/applications/msconfig/CMakeLists.txt +++ b/reactos/base/applications/msconfig/CMakeLists.txt @@ -1,6 +1,4 @@ -set_rc_compiler() - list(APPEND SOURCE toolspage.c srvpage.c @@ -12,7 +10,6 @@ list(APPEND SOURCE msconfig.rc) add_executable(msconfig ${SOURCE}) - set_module_type(msconfig win32gui UNICODE) add_importlibs(msconfig user32 advapi32 version comctl32 shell32 shlwapi msvcrt kernel32) add_pch(msconfig precomp.h) diff --git a/reactos/base/applications/mscutils/devmgmt/CMakeLists.txt b/reactos/base/applications/mscutils/devmgmt/CMakeLists.txt index ce77dfb6dc9..e32b229b7ad 100644 --- a/reactos/base/applications/mscutils/devmgmt/CMakeLists.txt +++ b/reactos/base/applications/mscutils/devmgmt/CMakeLists.txt @@ -1,6 +1,4 @@ -set_rc_compiler() - list(APPEND SOURCE about.c devmgmt.c @@ -10,7 +8,6 @@ list(APPEND SOURCE devmgmt.rc) add_executable(devmgmt ${SOURCE}) - set_module_type(devmgmt win32gui UNICODE) add_importlibs(devmgmt setupapi gdi32 user32 comctl32 advapi32 devmgr msvcrt kernel32) add_pch(devmgmt precomp.h) diff --git a/reactos/base/applications/mscutils/eventvwr/CMakeLists.txt b/reactos/base/applications/mscutils/eventvwr/CMakeLists.txt index 3d3151d9733..a15680efcd4 100644 --- a/reactos/base/applications/mscutils/eventvwr/CMakeLists.txt +++ b/reactos/base/applications/mscutils/eventvwr/CMakeLists.txt @@ -1,13 +1,8 @@ -set_rc_compiler() - add_executable(eventvwr eventvwr.c eventvwr.rc) - set_module_type(eventvwr win32gui UNICODE) add_importlibs(eventvwr user32 comctl32 advapi32 msvcrt kernel32) - if(MSVC) add_importlibs(eventvwr ntdll) endif() - add_cd_file(TARGET eventvwr DESTINATION reactos/system32 FOR all) diff --git a/reactos/base/applications/mscutils/servman/CMakeLists.txt b/reactos/base/applications/mscutils/servman/CMakeLists.txt index 036ee9d7d56..cbfb69805fc 100644 --- a/reactos/base/applications/mscutils/servman/CMakeLists.txt +++ b/reactos/base/applications/mscutils/servman/CMakeLists.txt @@ -1,6 +1,4 @@ -set_rc_compiler() - list(APPEND SOURCE about.c control.c @@ -24,11 +22,7 @@ list(APPEND SOURCE servman.rc) add_executable(servman ${SOURCE}) - set_module_type(servman win32gui UNICODE) - add_importlibs(servman user32 gdi32 advapi32 version comctl32 shell32 comdlg32 msvcrt kernel32) - add_pch(servman precomp.h) - add_cd_file(TARGET servman DESTINATION reactos/system32 FOR all) diff --git a/reactos/base/applications/mspaint/CMakeLists.txt b/reactos/base/applications/mspaint/CMakeLists.txt index 94ca4925629..40f14311db3 100644 --- a/reactos/base/applications/mspaint/CMakeLists.txt +++ b/reactos/base/applications/mspaint/CMakeLists.txt @@ -1,6 +1,4 @@ -set_rc_compiler() - add_executable(mspaint dialogs.c dib.c diff --git a/reactos/base/applications/mstsc/CMakeLists.txt b/reactos/base/applications/mstsc/CMakeLists.txt index c597e97d60d..9b903147d3d 100644 --- a/reactos/base/applications/mstsc/CMakeLists.txt +++ b/reactos/base/applications/mstsc/CMakeLists.txt @@ -1,6 +1,4 @@ -set_rc_compiler() - list(APPEND SOURCE bitmap.c bsops.c @@ -24,11 +22,7 @@ list(APPEND SOURCE rdc.rc) add_executable(mstsc ${SOURCE}) - set_module_type(mstsc win32gui UNICODE) - add_importlibs(mstsc user32 gdi32 comctl32 ws2_32 advapi32 shell32 ole32 comdlg32 msvcrt kernel32) - add_pch(mstsc precomp.h) - add_cd_file(TARGET mstsc DESTINATION reactos/system32 FOR all) diff --git a/reactos/base/applications/network/ipconfig/CMakeLists.txt b/reactos/base/applications/network/ipconfig/CMakeLists.txt index 3be4c6de9f0..d772922feed 100644 --- a/reactos/base/applications/network/ipconfig/CMakeLists.txt +++ b/reactos/base/applications/network/ipconfig/CMakeLists.txt @@ -1,6 +1,4 @@ -set_rc_compiler() - add_executable(ipconfig ipconfig.c ipconfig.rc) set_module_type(ipconfig win32cui) add_importlibs(ipconfig user32 iphlpapi advapi32 msvcrt kernel32) diff --git a/reactos/base/applications/network/ping/CMakeLists.txt b/reactos/base/applications/network/ping/CMakeLists.txt index 3e65117bb2b..ff77e11fb9d 100644 --- a/reactos/base/applications/network/ping/CMakeLists.txt +++ b/reactos/base/applications/network/ping/CMakeLists.txt @@ -1,15 +1,9 @@ add_definitions(-D__USE_W32_SOCKETS) - -set_rc_compiler() - add_executable(ping ping.c ping.rc) - set_module_type(ping win32cui UNICODE) add_importlibs(ping ws2_32 msvcrt kernel32) - if(MSVC) add_importlibs(ping ntdll) endif() - add_cd_file(TARGET ping DESTINATION reactos/system32 FOR all) diff --git a/reactos/base/applications/notepad/CMakeLists.txt b/reactos/base/applications/notepad/CMakeLists.txt index ee8b8806337..364323e45e4 100644 --- a/reactos/base/applications/notepad/CMakeLists.txt +++ b/reactos/base/applications/notepad/CMakeLists.txt @@ -6,10 +6,7 @@ list(APPEND SOURCE text.c rsrc.rc) -set_rc_compiler() - add_executable(notepad ${SOURCE}) - set_module_type(notepad win32gui UNICODE) add_importlibs(notepad user32 gdi32 comctl32 comdlg32 advapi32 shell32 msvcrt kernel32) add_pch(notepad notepad.h) diff --git a/reactos/base/applications/rapps/CMakeLists.txt b/reactos/base/applications/rapps/CMakeLists.txt index c0f933ee30b..ee33a605284 100644 --- a/reactos/base/applications/rapps/CMakeLists.txt +++ b/reactos/base/applications/rapps/CMakeLists.txt @@ -1,5 +1,4 @@ - list(APPEND SOURCE aboutdlg.c available.c @@ -22,13 +21,10 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${REACTOS_BINARY_DIR}/include/reactos) -set_rc_compiler() - add_executable(rapps ${SOURCE}) add_pch(rapps rapps.h) set_module_type(rapps win32gui UNICODE) target_link_libraries(rapps uuid) - add_importlibs(rapps advapi32 comctl32 gdi32 urlmon user32 shell32 shlwapi ole32 msvcrt kernel32 ntdll) add_dependencies(rapps rappsmsg) add_message_headers(ANSI rappsmsg.mc) diff --git a/reactos/base/applications/regedit/CMakeLists.txt b/reactos/base/applications/regedit/CMakeLists.txt index ec1dcf51c10..08f8f6ca6f6 100644 --- a/reactos/base/applications/regedit/CMakeLists.txt +++ b/reactos/base/applications/regedit/CMakeLists.txt @@ -1,6 +1,4 @@ -set_rc_compiler() - include_directories(BEFORE .) list(APPEND SOURCE @@ -21,15 +19,9 @@ list(APPEND SOURCE regedit.rc) add_executable(regedit ${SOURCE}) - set_module_type(regedit win32gui UNICODE) - target_link_libraries(regedit uuid) - add_importlibs(regedit user32 gdi32 advapi32 ole32 shell32 comctl32 comdlg32 shlwapi msvcrt kernel32) - add_pch(regedit regedit.h) - -#add_subdirectory(clb) - add_cd_file(TARGET regedit DESTINATION reactos FOR all) +#add_subdirectory(clb) diff --git a/reactos/base/applications/regedit/clb/CMakeLists.txt b/reactos/base/applications/regedit/clb/CMakeLists.txt index 29e38538f2e..11c6ad264fc 100644 --- a/reactos/base/applications/regedit/clb/CMakeLists.txt +++ b/reactos/base/applications/regedit/clb/CMakeLists.txt @@ -1,8 +1,6 @@ spec2def(clb.dll clb.spec) -set_rc_compiler() - add_library(clb SHARED clb.c clb.rc diff --git a/reactos/base/applications/regedt32/CMakeLists.txt b/reactos/base/applications/regedt32/CMakeLists.txt index 2e00f7b29e7..4a65a2919c3 100644 --- a/reactos/base/applications/regedt32/CMakeLists.txt +++ b/reactos/base/applications/regedt32/CMakeLists.txt @@ -1,8 +1,5 @@ -set_rc_compiler() - add_executable(regedt32 regedt32.c resource.rc) - set_module_type(regedt32 win32gui UNICODE) add_importlibs(regedt32 shell32 shlwapi msvcrt kernel32) add_cd_file(TARGET regedt32 DESTINATION reactos/system32 FOR all) diff --git a/reactos/base/applications/screensavers/3dtext/CMakeLists.txt b/reactos/base/applications/screensavers/3dtext/CMakeLists.txt index b81b1d315e7..8ae3ad7f67b 100644 --- a/reactos/base/applications/screensavers/3dtext/CMakeLists.txt +++ b/reactos/base/applications/screensavers/3dtext/CMakeLists.txt @@ -1,6 +1,4 @@ -set_rc_compiler() - add_executable(3dtext 3dtext.c settings.c @@ -11,5 +9,4 @@ add_pch(3dtext 3dtext.h) set_target_properties(3dtext PROPERTIES SUFFIX ".scr") target_link_libraries(3dtext scrnsave) add_importlibs(3dtext user32 gdi32 opengl32 glu32 advapi32 msvcrt kernel32) - add_cd_file(TARGET 3dtext DESTINATION reactos/system32 FOR all) diff --git a/reactos/base/applications/screensavers/logon/CMakeLists.txt b/reactos/base/applications/screensavers/logon/CMakeLists.txt index 41499e02b51..c13e506a6d4 100644 --- a/reactos/base/applications/screensavers/logon/CMakeLists.txt +++ b/reactos/base/applications/screensavers/logon/CMakeLists.txt @@ -1,11 +1,7 @@ -set_rc_compiler() - add_executable(logon logon.c logon.rc) - set_module_type(logon win32gui UNICODE) set_target_properties(logon PROPERTIES SUFFIX ".scr") - target_link_libraries(logon scrnsave) add_importlibs(logon user32 gdi32 msvcrt kernel32) add_cd_file(TARGET logon DESTINATION reactos/system32 FOR all) diff --git a/reactos/base/applications/setup16/CMakeLists.txt b/reactos/base/applications/setup16/CMakeLists.txt index ed84cd0da68..9f1d652adee 100644 --- a/reactos/base/applications/setup16/CMakeLists.txt +++ b/reactos/base/applications/setup16/CMakeLists.txt @@ -1,10 +1,5 @@ -set_rc_compiler() - -add_executable(setup16 - main.c) - +add_executable(setup16 main.c) set_module_type(setup16 win32gui UNICODE) add_importlibs(setup16 user32 gdi32 advapi32 msvcrt kernel32 shell32 setupapi) - add_cd_file(TARGET setup16 DESTINATION reactos/system32 FOR all) diff --git a/reactos/base/applications/shutdown/CMakeLists.txt b/reactos/base/applications/shutdown/CMakeLists.txt index 18c7aea690c..bf8ccf3fa24 100644 --- a/reactos/base/applications/shutdown/CMakeLists.txt +++ b/reactos/base/applications/shutdown/CMakeLists.txt @@ -1,6 +1,4 @@ -set_rc_compiler() - list(APPEND SOURCE gui.c misc.c @@ -8,7 +6,6 @@ list(APPEND SOURCE shutdown.rc) add_executable(shutdown ${SOURCE}) - set_module_type(shutdown win32cui UNICODE) add_importlibs(shutdown advapi32 user32 msvcrt powrprof kernel32) add_pch(shutdown precomp.h) diff --git a/reactos/base/applications/sndrec32/CMakeLists.txt b/reactos/base/applications/sndrec32/CMakeLists.txt index 553a29ea6df..7c8b4ebe5b4 100644 --- a/reactos/base/applications/sndrec32/CMakeLists.txt +++ b/reactos/base/applications/sndrec32/CMakeLists.txt @@ -1,6 +1,5 @@ set_cpp() -set_rc_compiler() add_executable(sndrec32 audio_format.cpp diff --git a/reactos/base/applications/sndvol32/CMakeLists.txt b/reactos/base/applications/sndvol32/CMakeLists.txt index 7c01fac4436..7b44fc814da 100644 --- a/reactos/base/applications/sndvol32/CMakeLists.txt +++ b/reactos/base/applications/sndvol32/CMakeLists.txt @@ -1,6 +1,4 @@ -set_rc_compiler() - list(APPEND SOURCE dialog.c misc.c @@ -9,7 +7,6 @@ list(APPEND SOURCE sndvol32.rc) add_executable(sndvol32 ${SOURCE}) - set_module_type(sndvol32 win32gui UNICODE) add_importlibs(sndvol32 user32 advapi32 gdi32 comctl32 shell32 winmm msvcrt kernel32 ntdll) add_pch(sndvol32 sndvol32.h) diff --git a/reactos/base/applications/taskmgr/CMakeLists.txt b/reactos/base/applications/taskmgr/CMakeLists.txt index 5b0e8c00ea5..a0a4e2a7d3b 100644 --- a/reactos/base/applications/taskmgr/CMakeLists.txt +++ b/reactos/base/applications/taskmgr/CMakeLists.txt @@ -1,6 +1,4 @@ -set_rc_compiler() - list(APPEND SOURCE about.c affinity.c @@ -23,7 +21,6 @@ list(APPEND SOURCE taskmgr.rc) add_executable(taskmgr ${SOURCE}) - set_module_type(taskmgr win32gui UNICODE) add_importlibs(taskmgr advapi32 user32 gdi32 shell32 comctl32 msvcrt kernel32 ntdll) add_pch(taskmgr precomp.h) diff --git a/reactos/base/setup/reactos/CMakeLists.txt b/reactos/base/setup/reactos/CMakeLists.txt index dbc2bdfa57d..e01d5325141 100644 --- a/reactos/base/setup/reactos/CMakeLists.txt +++ b/reactos/base/setup/reactos/CMakeLists.txt @@ -1,10 +1,6 @@ -set_rc_compiler() - add_executable(reactos reactos.c reactos.rc) - target_link_libraries(reactos uuid) - set_module_type(reactos win32gui UNICODE) add_importlibs(reactos gdi32 user32 comctl32 setupapi msvcrt kernel32 ntdll) add_cd_file(TARGET reactos DESTINATION reactos NO_CAB FOR bootcd) diff --git a/reactos/base/setup/vmwinst/CMakeLists.txt b/reactos/base/setup/vmwinst/CMakeLists.txt index 42d7ae56a1a..f5eac7ad830 100644 --- a/reactos/base/setup/vmwinst/CMakeLists.txt +++ b/reactos/base/setup/vmwinst/CMakeLists.txt @@ -1,21 +1,6 @@ -set_rc_compiler() - add_executable(vmwinst vmwinst.c vmwinst.rc) - target_link_libraries(vmwinst ${PSEH_LIB}) - set_module_type(vmwinst win32gui UNICODE) -add_importlibs(vmwinst - advapi32 - comctl32 - comdlg32 - newdev - user32 - setupapi - shell32 - msvcrt - kernel32 - ntdll) - +add_importlibs(vmwinst advapi32 comctl32 comdlg32 newdev user32 setupapi shell32 msvcrt kernel32 ntdll) add_cd_file(TARGET vmwinst DESTINATION reactos/system32 FOR all) diff --git a/reactos/base/setup/welcome/CMakeLists.txt b/reactos/base/setup/welcome/CMakeLists.txt index b676ac09d1f..8783814865f 100644 --- a/reactos/base/setup/welcome/CMakeLists.txt +++ b/reactos/base/setup/welcome/CMakeLists.txt @@ -1,8 +1,5 @@ -set_rc_compiler() - add_executable(welcome welcome.c welcome.rc) - set_module_type(welcome win32gui UNICODE) add_importlibs(welcome gdi32 user32 msvcrt kernel32 ntdll) add_cd_file(TARGET welcome DESTINATION reactos NO_CAB FOR bootcd) diff --git a/reactos/base/shell/cmd/CMakeLists.txt b/reactos/base/shell/cmd/CMakeLists.txt index dbd1482e115..e1dcf6cc420 100644 --- a/reactos/base/shell/cmd/CMakeLists.txt +++ b/reactos/base/shell/cmd/CMakeLists.txt @@ -1,15 +1,10 @@ - add_definitions( -DANONYMOUSUNIONS -D_DEBUG_MEM) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -set_rc_compiler() - -list(APPEND SOURCE main.c cmd.rc) - list(APPEND SOURCE alias.c assoc.c @@ -43,6 +38,7 @@ list(APPEND SOURCE internal.c label.c locale.c + main.c memory.c misc.c mklink.c @@ -69,12 +65,11 @@ list(APPEND SOURCE verify.c vol.c where.c - window.c) + window.c + cmd.rc) add_executable(cmd ${SOURCE}) - target_link_libraries(cmd wine) - set_module_type(cmd win32cui UNICODE) add_importlibs(cmd advapi32 user32 msvcrt kernel32 ntdll) add_pch(cmd precomp.h) diff --git a/reactos/base/shell/explorer-new/CMakeLists.txt b/reactos/base/shell/explorer-new/CMakeLists.txt index 497dc14fdde..2e1122ec326 100644 --- a/reactos/base/shell/explorer-new/CMakeLists.txt +++ b/reactos/base/shell/explorer-new/CMakeLists.txt @@ -1,9 +1,6 @@ - add_definitions(-DWIN32) -set_rc_compiler() - list(APPEND SOURCE desktop.c dragdrop.c @@ -18,23 +15,8 @@ list(APPEND SOURCE explorer.rc) add_executable(explorer_new ${SOURCE}) - target_link_libraries(explorer_new uuid) - set_module_type(explorer_new win32gui UNICODE) -add_importlibs(explorer_new - advapi32 - gdi32 - user32 - comctl32 - ole32 - oleaut32 - shell32 - shlwapi - version - msvcrt - kernel32 - ntdll) +add_importlibs(explorer_new advapi32 gdi32 user32 comctl32 ole32 oleaut32 shell32 shlwapi version msvcrt kernel32 ntdll) add_pch(explorer_new precomp.h) - add_cd_file(TARGET explorer_new DESTINATION reactos FOR all) diff --git a/reactos/base/shell/explorer/CMakeLists.txt b/reactos/base/shell/explorer/CMakeLists.txt index 80a0813d143..75c86f8fca2 100644 --- a/reactos/base/shell/explorer/CMakeLists.txt +++ b/reactos/base/shell/explorer/CMakeLists.txt @@ -1,8 +1,6 @@ add_subdirectory(notifyhook) -set_rc_compiler() - #NOTE : explorer doesn't follow standard c++, and so doesn't compile with stlport headers #I'm not willing to do it if explorer_new is hanging around. #jgardou @@ -53,7 +51,6 @@ list(APPEND SOURCE utility/shellbrowserimpl.cpp) # utility/shelltests.cpp add_executable(explorer ${SOURCE}) - set_subsystem(explorer windows) set_entrypoint(explorer wWinMainCRTStartup) diff --git a/reactos/base/system/diskpart/CMakeLists.txt b/reactos/base/system/diskpart/CMakeLists.txt index 38ecfa5230f..528a28413a4 100644 --- a/reactos/base/system/diskpart/CMakeLists.txt +++ b/reactos/base/system/diskpart/CMakeLists.txt @@ -1,4 +1,3 @@ -set_rc_compiler() add_executable(diskpart active.c @@ -44,6 +43,6 @@ add_executable(diskpart set_module_type(diskpart win32cui UNICODE) add_importlibs(diskpart user32 msvcrt kernel32) if(MSVC) -add_importlibs(diskpart ntdll) + add_importlibs(diskpart ntdll) endif() -add_cd_file(TARGET diskpart DESTINATION reactos/system32 FOR all) \ No newline at end of file +add_cd_file(TARGET diskpart DESTINATION reactos/system32 FOR all) diff --git a/reactos/base/system/format/CMakeLists.txt b/reactos/base/system/format/CMakeLists.txt index 5973db5f814..d54a55a8d81 100644 --- a/reactos/base/system/format/CMakeLists.txt +++ b/reactos/base/system/format/CMakeLists.txt @@ -1,8 +1,5 @@ -set_rc_compiler() - add_executable(format format.c format.rc) - set_module_type(format win32cui) add_importlibs(format user32 fmifs msvcrt kernel32 ntdll) add_cd_file(TARGET format DESTINATION reactos/system32 FOR all) diff --git a/reactos/base/system/regsvr32/CMakeLists.txt b/reactos/base/system/regsvr32/CMakeLists.txt index 4dd90f07d91..02c4aad8e70 100644 --- a/reactos/base/system/regsvr32/CMakeLists.txt +++ b/reactos/base/system/regsvr32/CMakeLists.txt @@ -1,8 +1,5 @@ -set_rc_compiler() - add_executable(regsvr32 regsvr32.c regsvr32.rc) - set_module_type(regsvr32 win32gui UNICODE) add_importlibs(regsvr32 user32 shell32 ole32 msvcrt kernel32 ntdll) add_cd_file(TARGET regsvr32 DESTINATION reactos/system32 FOR all) diff --git a/reactos/base/system/rundll32/CMakeLists.txt b/reactos/base/system/rundll32/CMakeLists.txt index f5454e537d4..365085f306e 100644 --- a/reactos/base/system/rundll32/CMakeLists.txt +++ b/reactos/base/system/rundll32/CMakeLists.txt @@ -1,9 +1,6 @@ include_directories(.) -set_rc_compiler() - add_executable(rundll32 rundll32.c rundll32.rc) - set_module_type(rundll32 win32gui UNICODE) add_importlibs(rundll32 user32 msvcrt kernel32 ntdll) add_cd_file(TARGET rundll32 DESTINATION reactos/system32 FOR all) diff --git a/reactos/base/system/runonce/CMakeLists.txt b/reactos/base/system/runonce/CMakeLists.txt index 47eda7dc4f9..a455a80074f 100644 --- a/reactos/base/system/runonce/CMakeLists.txt +++ b/reactos/base/system/runonce/CMakeLists.txt @@ -1,8 +1,5 @@ -set_rc_compiler() - add_executable(runonce runonce.c runonce.rc) - set_module_type(runonce win32gui UNICODE) add_importlibs(runonce advapi32 user32 msvcrt kernel32 ntdll) add_cd_file(TARGET runonce DESTINATION reactos/system32 FOR all) diff --git a/reactos/base/system/subst/CMakeLists.txt b/reactos/base/system/subst/CMakeLists.txt index 6a417270fb3..e1f04ea61c8 100644 --- a/reactos/base/system/subst/CMakeLists.txt +++ b/reactos/base/system/subst/CMakeLists.txt @@ -1,8 +1,5 @@ -set_rc_compiler() - add_executable(subst subst.c subst.rc) - set_module_type(subst win32cui UNICODE) add_importlibs(subst msvcrt kernel32 user32 ntdll) add_cd_file(TARGET subst DESTINATION reactos/system32 FOR all) diff --git a/reactos/cmake/gcc.cmake b/reactos/cmake/gcc.cmake index 5f09cdc5ba0..ac14dfaf25c 100644 --- a/reactos/cmake/gcc.cmake +++ b/reactos/cmake/gcc.cmake @@ -209,9 +209,6 @@ function(set_module_type_toolchain MODULE TYPE) endif() endfunction() -function(set_rc_compiler) -endfunction() - function(add_delay_importlibs MODULE) foreach(LIB ${ARGN}) target_link_libraries(${MODULE} lib${LIB}_delayed) diff --git a/reactos/cmake/msvc.cmake b/reactos/cmake/msvc.cmake index 4e92f6c77dc..952403ed6b5 100644 --- a/reactos/cmake/msvc.cmake +++ b/reactos/cmake/msvc.cmake @@ -117,9 +117,6 @@ function(set_module_type_toolchain MODULE TYPE) endif() endfunction() -function(set_rc_compiler) -endfunction() - #define those for having real libraries set(CMAKE_IMPLIB_CREATE_STATIC_LIBRARY "LINK /LIB /NOLOGO /OUT: ") set(CMAKE_STUB_ASM_COMPILE_OBJECT " /Cp /Fo /c /Ta ") diff --git a/reactos/dll/cpl/access/CMakeLists.txt b/reactos/dll/cpl/access/CMakeLists.txt index a39f37655f3..e031dd3bac1 100644 --- a/reactos/dll/cpl/access/CMakeLists.txt +++ b/reactos/dll/cpl/access/CMakeLists.txt @@ -1,6 +1,4 @@ -set_rc_compiler() - spec2def(access.cpl access.spec) add_library(access SHARED @@ -11,17 +9,9 @@ add_library(access SHARED mouse.c sound.c access.rc - ${CMAKE_CURRENT_BINARY_DIR}/access.def) + ${CMAKE_CURRENT_BINARY_DIR}/access.def) set_module_type(access cpl UNICODE) - -add_importlibs(access - msvcrt - user32 - gdi32 - advapi32 - comctl32 - kernel32) - +add_importlibs(access user32 gdi32 advapi32 comctl32 msvcrt kernel32) add_pch(access access.h) add_cd_file(TARGET access DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/cpl/appwiz/CMakeLists.txt b/reactos/dll/cpl/appwiz/CMakeLists.txt index a92e6bc1f0b..10e57fbcc79 100644 --- a/reactos/dll/cpl/appwiz/CMakeLists.txt +++ b/reactos/dll/cpl/appwiz/CMakeLists.txt @@ -1,6 +1,4 @@ -set_rc_compiler() - spec2def(appwiz.cpl appwiz.spec) add_library(appwiz SHARED @@ -10,17 +8,7 @@ add_library(appwiz SHARED ${CMAKE_CURRENT_BINARY_DIR}/appwiz.def) set_module_type(appwiz cpl UNICODE) - target_link_libraries(appwiz uuid) - -add_importlibs(appwiz - msvcrt - user32 - ole32 - advapi32 - comctl32 - shell32 - kernel32) - +add_importlibs(appwiz user32 ole32 advapi32 comctl32 shell32 msvcrt kernel32) add_pch(appwiz appwiz.h) add_cd_file(TARGET appwiz DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/cpl/desk/CMakeLists.txt b/reactos/dll/cpl/desk/CMakeLists.txt index d1d674b637c..c32c115adbd 100644 --- a/reactos/dll/cpl/desk/CMakeLists.txt +++ b/reactos/dll/cpl/desk/CMakeLists.txt @@ -1,8 +1,6 @@ add_definitions(-D_WIN32) -set_rc_compiler() - spec2def(desk.cpl desk.spec) add_library(desk SHARED @@ -27,7 +25,6 @@ add_library(desk SHARED ${CMAKE_CURRENT_BINARY_DIR}/desk.def) set_module_type(desk cpl UNICODE) - target_link_libraries(desk uuid) add_importlibs(desk diff --git a/reactos/dll/cpl/hdwwiz/CMakeLists.txt b/reactos/dll/cpl/hdwwiz/CMakeLists.txt index 52715082276..accc2fe2538 100644 --- a/reactos/dll/cpl/hdwwiz/CMakeLists.txt +++ b/reactos/dll/cpl/hdwwiz/CMakeLists.txt @@ -1,10 +1,6 @@ -set_rc_compiler() - spec2def(hdwwiz.cpl hdwwiz.spec) - add_library(hdwwiz SHARED hdwwiz.c hdwwiz.rc ${CMAKE_CURRENT_BINARY_DIR}/hdwwiz.def) - set_module_type(hdwwiz cpl UNICODE) add_importlibs(hdwwiz diff --git a/reactos/dll/cpl/inetcpl/CMakeLists.txt b/reactos/dll/cpl/inetcpl/CMakeLists.txt index 70672997c52..c8dafa9a81c 100644 --- a/reactos/dll/cpl/inetcpl/CMakeLists.txt +++ b/reactos/dll/cpl/inetcpl/CMakeLists.txt @@ -1,6 +1,4 @@ -set_rc_compiler() - include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(inetcpl.cpl inetcpl.spec) @@ -15,26 +13,8 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/inetcpl.def) add_library(inetcpl SHARED ${SOURCE}) - set_module_type(inetcpl cpl UNICODE) - target_link_libraries(inetcpl wine) - -add_importlibs(inetcpl - advapi32 - comctl32 - user32 - gdi32 - shlwapi - msvcrt - kernel32 - ntdll) - -add_delay_importlibs(inetcpl - cryptui - wininet - ole32 - urlmon) - +add_importlibs(inetcpl advapi32 comctl32 user32 gdi32 shlwapi msvcrt kernel32 ntdll) +add_delay_importlibs(inetcpl cryptui wininet ole32 urlmon) add_cd_file(TARGET inetcpl DESTINATION reactos/system32 FOR all) - diff --git a/reactos/dll/cpl/input/CMakeLists.txt b/reactos/dll/cpl/input/CMakeLists.txt index 931a249c2fd..a4aa664cc88 100644 --- a/reactos/dll/cpl/input/CMakeLists.txt +++ b/reactos/dll/cpl/input/CMakeLists.txt @@ -1,6 +1,4 @@ -set_rc_compiler() - spec2def(input.dll input.spec) add_library(input SHARED diff --git a/reactos/dll/cpl/intl/CMakeLists.txt b/reactos/dll/cpl/intl/CMakeLists.txt index d0c7d7cbc64..a675d50c231 100644 --- a/reactos/dll/cpl/intl/CMakeLists.txt +++ b/reactos/dll/cpl/intl/CMakeLists.txt @@ -1,6 +1,4 @@ -set_rc_compiler() - spec2def(intl.cpl intl.spec) add_library(intl SHARED diff --git a/reactos/dll/cpl/joy/CMakeLists.txt b/reactos/dll/cpl/joy/CMakeLists.txt index 535d6ad541c..d0759ae1cf8 100644 --- a/reactos/dll/cpl/joy/CMakeLists.txt +++ b/reactos/dll/cpl/joy/CMakeLists.txt @@ -1,12 +1,7 @@ -set_rc_compiler() - spec2def(joy.cpl joy.spec) - add_library(joy SHARED joy.c joy.rc ${CMAKE_CURRENT_BINARY_DIR}/joy.def) - set_module_type(joy cpl UNICODE) - target_link_libraries(joy uuid) add_importlibs(joy diff --git a/reactos/dll/cpl/mmsys/CMakeLists.txt b/reactos/dll/cpl/mmsys/CMakeLists.txt index 2544d007ee4..f364ca147ae 100644 --- a/reactos/dll/cpl/mmsys/CMakeLists.txt +++ b/reactos/dll/cpl/mmsys/CMakeLists.txt @@ -1,6 +1,4 @@ -set_rc_compiler() - spec2def(mmsys.cpl mmsys.spec) add_library(mmsys SHARED diff --git a/reactos/dll/cpl/powercfg/CMakeLists.txt b/reactos/dll/cpl/powercfg/CMakeLists.txt index 9f4f2fcbba4..d89a9a43d09 100644 --- a/reactos/dll/cpl/powercfg/CMakeLists.txt +++ b/reactos/dll/cpl/powercfg/CMakeLists.txt @@ -1,6 +1,4 @@ -set_rc_compiler() - spec2def(powercfg.cpl powercfg.spec) add_library(powercfg SHARED diff --git a/reactos/dll/cpl/sysdm/CMakeLists.txt b/reactos/dll/cpl/sysdm/CMakeLists.txt index 5b1fbe26d25..73221af6277 100644 --- a/reactos/dll/cpl/sysdm/CMakeLists.txt +++ b/reactos/dll/cpl/sysdm/CMakeLists.txt @@ -1,6 +1,4 @@ -set_rc_compiler() - spec2def(sysdm.cpl sysdm.spec) list(APPEND SOURCE @@ -18,7 +16,6 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/sysdm.def) add_library(sysdm SHARED ${SOURCE}) - set_module_type(sysdm cpl UNICODE) add_importlibs(sysdm diff --git a/reactos/dll/cpl/telephon/CMakeLists.txt b/reactos/dll/cpl/telephon/CMakeLists.txt index 81adeeb6f8e..cb537055477 100644 --- a/reactos/dll/cpl/telephon/CMakeLists.txt +++ b/reactos/dll/cpl/telephon/CMakeLists.txt @@ -1,12 +1,7 @@ -set_rc_compiler() - spec2def(telephon.cpl telephon.spec) - add_library(telephon SHARED telephon.c telephon.rc ${CMAKE_CURRENT_BINARY_DIR}/telephon.def) - set_module_type(telephon cpl UNICODE) - target_link_libraries(telephon uuid) add_importlibs(telephon diff --git a/reactos/dll/cpl/timedate/CMakeLists.txt b/reactos/dll/cpl/timedate/CMakeLists.txt index 8290390985a..954111b7584 100644 --- a/reactos/dll/cpl/timedate/CMakeLists.txt +++ b/reactos/dll/cpl/timedate/CMakeLists.txt @@ -1,6 +1,4 @@ -set_rc_compiler() - spec2def(timedate.cpl timedate.spec) add_library(timedate SHARED diff --git a/reactos/dll/cpl/usrmgr/CMakeLists.txt b/reactos/dll/cpl/usrmgr/CMakeLists.txt index c87e1d4c504..77d846c6058 100644 --- a/reactos/dll/cpl/usrmgr/CMakeLists.txt +++ b/reactos/dll/cpl/usrmgr/CMakeLists.txt @@ -1,9 +1,6 @@ - include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine) -set_rc_compiler() - spec2def(usrmgr.cpl usrmgr.spec) add_library(usrmgr SHARED diff --git a/reactos/dll/cpl/wined3dcfg/CMakeLists.txt b/reactos/dll/cpl/wined3dcfg/CMakeLists.txt index 3a942cc9e28..6434ec784cb 100644 --- a/reactos/dll/cpl/wined3dcfg/CMakeLists.txt +++ b/reactos/dll/cpl/wined3dcfg/CMakeLists.txt @@ -1,6 +1,4 @@ -set_rc_compiler() - spec2def(wined3dcfg.cpl wined3dcfg.spec) add_library(wined3dcfg SHARED diff --git a/reactos/dll/directx/dplayx/CMakeLists.txt b/reactos/dll/directx/dplayx/CMakeLists.txt index 05893e574d5..fbf7cea98f9 100644 --- a/reactos/dll/directx/dplayx/CMakeLists.txt +++ b/reactos/dll/directx/dplayx/CMakeLists.txt @@ -1,6 +1,4 @@ -set_rc_compiler() - spec2def(dplayx.dll dplayx.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -21,11 +19,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_library(dplayx SHARED ${SOURCE}) set_module_type(dplayx win32dll) - -target_link_libraries(dplayx - wine - uuid - dxguid) +target_link_libraries(dplayx wine uuid dxguid) add_importlibs(dplayx advapi32 @@ -37,4 +31,3 @@ add_importlibs(dplayx ntdll) add_cd_file(TARGET dplayx DESTINATION reactos/system32 FOR all) - diff --git a/reactos/dll/directx/wine/d3d8/CMakeLists.txt b/reactos/dll/directx/wine/d3d8/CMakeLists.txt index 329f2cdc011..a54b23a06d3 100644 --- a/reactos/dll/directx/wine/d3d8/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3d8/CMakeLists.txt @@ -1,13 +1,10 @@ - add_definitions( -D__WINESRC__ -DUSE_WIN32_OPENGL) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -set_rc_compiler() - spec2def(d3d8.dll d3d8.spec) list(APPEND SOURCE @@ -25,9 +22,7 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/d3d8.def) add_library(d3d8 SHARED ${SOURCE}) - set_module_type(d3d8 win32dll UNICODE) - target_link_libraries(d3d8 uuid wine) add_importlibs(d3d8 diff --git a/reactos/dll/directx/wine/d3d9/CMakeLists.txt b/reactos/dll/directx/wine/d3d9/CMakeLists.txt index 15eec49f145..52ee8b65c30 100644 --- a/reactos/dll/directx/wine/d3d9/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3d9/CMakeLists.txt @@ -1,13 +1,10 @@ - add_definitions( -D__WINESRC__ -DUSE_WIN32_OPENGL) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -set_rc_compiler() - spec2def(d3d9.dll d3d9.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -28,9 +25,7 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/d3d9.def) add_library(d3d9 SHARED ${SOURCE}) - set_module_type(d3d9 win32dll UNICODE) - target_link_libraries(d3d9 uuid wine) add_importlibs(d3d9 @@ -45,4 +40,3 @@ add_importlibs(d3d9 add_dependencies(d3d9 wineheaders) add_pch(d3d9 d3d9_private.h) add_cd_file(TARGET d3d9 DESTINATION reactos/system32 FOR all) - diff --git a/reactos/dll/directx/wine/d3dx9_24/CMakeLists.txt b/reactos/dll/directx/wine/d3dx9_24/CMakeLists.txt index 6b10e93bd7b..a3c47aecc27 100644 --- a/reactos/dll/directx/wine/d3dx9_24/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3dx9_24/CMakeLists.txt @@ -1,4 +1,3 @@ -set_rc_compiler() spec2def(d3dx9_24.dll d3dx9_24.spec ADD_IMPORTLIB) @@ -9,14 +8,10 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_24.def) add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - add_library(d3dx9_24 SHARED ${SOURCE}) set_module_type(d3dx9_24 win32dll) - -target_link_libraries(d3dx9_24 - wine) +target_link_libraries(d3dx9_24 wine) add_importlibs(d3dx9_24 d3dx9_36 @@ -30,4 +25,3 @@ add_importlibs(d3dx9_24 add_dependencies(d3dx9_24 wineheaders) add_cd_file(TARGET d3dx9_24 DESTINATION reactos/system32 FOR all) - diff --git a/reactos/dll/directx/wine/d3dx9_25/CMakeLists.txt b/reactos/dll/directx/wine/d3dx9_25/CMakeLists.txt index a3138e8e6b1..fc51ea71420 100644 --- a/reactos/dll/directx/wine/d3dx9_25/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3dx9_25/CMakeLists.txt @@ -1,4 +1,3 @@ -set_rc_compiler() spec2def(d3dx9_25.dll d3dx9_25.spec) @@ -9,14 +8,10 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_25.def) add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - add_library(d3dx9_25 SHARED ${SOURCE}) set_module_type(d3dx9_25 win32dll) - -target_link_libraries(d3dx9_25 - wine) +target_link_libraries(d3dx9_25 wine) add_importlibs(d3dx9_25 d3dx9_36 @@ -31,4 +26,3 @@ add_importlibs(d3dx9_25 add_dependencies(d3dx9_25 wineheaders) add_cd_file(TARGET d3dx9_25 DESTINATION reactos/system32 FOR all) - diff --git a/reactos/dll/directx/wine/d3dx9_26/CMakeLists.txt b/reactos/dll/directx/wine/d3dx9_26/CMakeLists.txt index efb2eeb47a2..c6efb92b2ae 100644 --- a/reactos/dll/directx/wine/d3dx9_26/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3dx9_26/CMakeLists.txt @@ -1,4 +1,3 @@ -set_rc_compiler() spec2def(d3dx9_26.dll d3dx9_26.spec) @@ -9,14 +8,10 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_26.def) add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - add_library(d3dx9_26 SHARED ${SOURCE}) set_module_type(d3dx9_26 win32dll) - -target_link_libraries(d3dx9_26 - wine) +target_link_libraries(d3dx9_26 wine) add_importlibs(d3dx9_26 d3d9 diff --git a/reactos/dll/directx/wine/d3dx9_27/CMakeLists.txt b/reactos/dll/directx/wine/d3dx9_27/CMakeLists.txt index 974974657cc..a79898a8a4f 100644 --- a/reactos/dll/directx/wine/d3dx9_27/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3dx9_27/CMakeLists.txt @@ -1,4 +1,3 @@ -set_rc_compiler() spec2def(d3dx9_27.dll d3dx9_27.spec) @@ -9,14 +8,10 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_27.def) add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - add_library(d3dx9_27 SHARED ${SOURCE}) set_module_type(d3dx9_27 win32dll) - -target_link_libraries(d3dx9_27 - wine) +target_link_libraries(d3dx9_27 wine) add_importlibs(d3dx9_27 d3d9 diff --git a/reactos/dll/directx/wine/d3dx9_28/CMakeLists.txt b/reactos/dll/directx/wine/d3dx9_28/CMakeLists.txt index 5d34deb88b8..9f8996bb2c0 100644 --- a/reactos/dll/directx/wine/d3dx9_28/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3dx9_28/CMakeLists.txt @@ -1,4 +1,3 @@ -set_rc_compiler() spec2def(d3dx9_28.dll d3dx9_28.spec) @@ -9,14 +8,10 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_28.def) add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - add_library(d3dx9_28 SHARED ${SOURCE}) set_module_type(d3dx9_28 win32dll) - -target_link_libraries(d3dx9_28 - wine) +target_link_libraries(d3dx9_28 wine) add_importlibs(d3dx9_28 d3d9 diff --git a/reactos/dll/directx/wine/d3dx9_29/CMakeLists.txt b/reactos/dll/directx/wine/d3dx9_29/CMakeLists.txt index e0d576f3b1f..171b54a571e 100644 --- a/reactos/dll/directx/wine/d3dx9_29/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3dx9_29/CMakeLists.txt @@ -1,4 +1,3 @@ -set_rc_compiler() spec2def(d3dx9_29.dll d3dx9_29.spec) @@ -9,14 +8,10 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_29.def) add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - add_library(d3dx9_29 SHARED ${SOURCE}) set_module_type(d3dx9_29 win32dll) - -target_link_libraries(d3dx9_29 - wine) +target_link_libraries(d3dx9_29 wine) add_importlibs(d3dx9_29 d3d9 diff --git a/reactos/dll/directx/wine/d3dx9_30/CMakeLists.txt b/reactos/dll/directx/wine/d3dx9_30/CMakeLists.txt index 00ce311e881..f51c40bb9d5 100644 --- a/reactos/dll/directx/wine/d3dx9_30/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3dx9_30/CMakeLists.txt @@ -1,4 +1,3 @@ -set_rc_compiler() spec2def(d3dx9_30.dll d3dx9_30.spec) @@ -9,14 +8,10 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_30.def) add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - add_library(d3dx9_30 SHARED ${SOURCE}) set_module_type(d3dx9_30 win32dll) - -target_link_libraries(d3dx9_30 - wine) +target_link_libraries(d3dx9_30 wine) add_importlibs(d3dx9_30 d3d9 diff --git a/reactos/dll/directx/wine/d3dx9_31/CMakeLists.txt b/reactos/dll/directx/wine/d3dx9_31/CMakeLists.txt index 84ad7f4bff5..f3ae270408a 100644 --- a/reactos/dll/directx/wine/d3dx9_31/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3dx9_31/CMakeLists.txt @@ -1,4 +1,3 @@ -set_rc_compiler() spec2def(d3dx9_31.dll d3dx9_31.spec) @@ -9,14 +8,10 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_31.def) add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - add_library(d3dx9_31 SHARED ${SOURCE}) set_module_type(d3dx9_31 win32dll) - -target_link_libraries(d3dx9_31 - wine) +target_link_libraries(d3dx9_31 wine) add_importlibs(d3dx9_31 d3d9 diff --git a/reactos/dll/directx/wine/d3dx9_32/CMakeLists.txt b/reactos/dll/directx/wine/d3dx9_32/CMakeLists.txt index 2daf736e121..1430a053918 100644 --- a/reactos/dll/directx/wine/d3dx9_32/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3dx9_32/CMakeLists.txt @@ -1,4 +1,3 @@ -set_rc_compiler() spec2def(d3dx9_32.dll d3dx9_32.spec) @@ -9,14 +8,10 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_32.def) add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - add_library(d3dx9_32 SHARED ${SOURCE}) set_module_type(d3dx9_32 win32dll) - -target_link_libraries(d3dx9_32 - wine) +target_link_libraries(d3dx9_32 wine) add_importlibs(d3dx9_32 d3d9 diff --git a/reactos/dll/directx/wine/d3dx9_33/CMakeLists.txt b/reactos/dll/directx/wine/d3dx9_33/CMakeLists.txt index be87694c231..29c9ba03e71 100644 --- a/reactos/dll/directx/wine/d3dx9_33/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3dx9_33/CMakeLists.txt @@ -1,4 +1,3 @@ -set_rc_compiler() spec2def(d3dx9_33.dll d3dx9_33.spec) @@ -9,14 +8,10 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_33.def) add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - add_library(d3dx9_33 SHARED ${SOURCE}) set_module_type(d3dx9_33 win32dll) - -target_link_libraries(d3dx9_33 - wine) +target_link_libraries(d3dx9_33 wine) add_importlibs(d3dx9_33 d3d9 diff --git a/reactos/dll/directx/wine/d3dx9_34/CMakeLists.txt b/reactos/dll/directx/wine/d3dx9_34/CMakeLists.txt index 80ae9093171..25e493fd948 100644 --- a/reactos/dll/directx/wine/d3dx9_34/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3dx9_34/CMakeLists.txt @@ -1,4 +1,3 @@ -set_rc_compiler() spec2def(d3dx9_34.dll d3dx9_34.spec) @@ -9,14 +8,10 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_34.def) add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - add_library(d3dx9_34 SHARED ${SOURCE}) set_module_type(d3dx9_34 win32dll) - -target_link_libraries(d3dx9_34 - wine) +target_link_libraries(d3dx9_34 wine) add_importlibs(d3dx9_34 d3d9 diff --git a/reactos/dll/directx/wine/d3dx9_35/CMakeLists.txt b/reactos/dll/directx/wine/d3dx9_35/CMakeLists.txt index f71621388ab..4edb196219e 100644 --- a/reactos/dll/directx/wine/d3dx9_35/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3dx9_35/CMakeLists.txt @@ -1,4 +1,3 @@ -set_rc_compiler() spec2def(d3dx9_35.dll d3dx9_35.spec) @@ -8,14 +7,10 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_35.def) add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - add_library(d3dx9_35 SHARED ${SOURCE}) set_module_type(d3dx9_35 win32dll) - -target_link_libraries(d3dx9_35 - wine) +target_link_libraries(d3dx9_35 wine) add_importlibs(d3dx9_35 d3dx9_36 diff --git a/reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt b/reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt index c17ecfe9bc0..cadec7efd41 100644 --- a/reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt @@ -1,4 +1,3 @@ -set_rc_compiler() spec2def(d3dx9_36.dll d3dx9_36.spec ADD_IMPORTLIB) @@ -18,9 +17,7 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_36.def) add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - add_library(d3dx9_36 SHARED ${SOURCE}) set_module_type(d3dx9_36 win32dll) target_link_libraries(d3dx9_36 uuid wine) diff --git a/reactos/dll/directx/wine/d3dx9_37/CMakeLists.txt b/reactos/dll/directx/wine/d3dx9_37/CMakeLists.txt index ac929e8263d..f6b45d84070 100644 --- a/reactos/dll/directx/wine/d3dx9_37/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3dx9_37/CMakeLists.txt @@ -1,4 +1,3 @@ -set_rc_compiler() spec2def(d3dx9_37.dll d3dx9_37.spec) @@ -8,14 +7,10 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_37.def) add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - add_library(d3dx9_37 SHARED ${SOURCE}) set_module_type(d3dx9_37 win32dll) - -target_link_libraries(d3dx9_37 - wine) +target_link_libraries(d3dx9_37 wine) add_importlibs(d3dx9_37 d3dx9_36 diff --git a/reactos/dll/directx/wine/d3dx9_38/CMakeLists.txt b/reactos/dll/directx/wine/d3dx9_38/CMakeLists.txt index 9fccb7207cd..bb6212ff722 100644 --- a/reactos/dll/directx/wine/d3dx9_38/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3dx9_38/CMakeLists.txt @@ -1,4 +1,3 @@ -set_rc_compiler() spec2def(d3dx9_38.dll d3dx9_38.spec) @@ -8,14 +7,10 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_38.def) add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - add_library(d3dx9_38 SHARED ${SOURCE}) set_module_type(d3dx9_38 win32dll) - -target_link_libraries(d3dx9_38 - wine) +target_link_libraries(d3dx9_38 wine) add_importlibs(d3dx9_38 d3dx9_36 diff --git a/reactos/dll/directx/wine/d3dx9_39/CMakeLists.txt b/reactos/dll/directx/wine/d3dx9_39/CMakeLists.txt index 668b18dc006..d538bb8ead8 100644 --- a/reactos/dll/directx/wine/d3dx9_39/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3dx9_39/CMakeLists.txt @@ -1,4 +1,3 @@ -set_rc_compiler() spec2def(d3dx9_39.dll d3dx9_39.spec) @@ -8,14 +7,10 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_39.def) add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - add_library(d3dx9_39 SHARED ${SOURCE}) set_module_type(d3dx9_39 win32dll) - -target_link_libraries(d3dx9_39 - wine) +target_link_libraries(d3dx9_39 wine) add_importlibs(d3dx9_39 d3dx9_36 diff --git a/reactos/dll/directx/wine/d3dx9_40/CMakeLists.txt b/reactos/dll/directx/wine/d3dx9_40/CMakeLists.txt index 7c80c06f2cf..17bf896a146 100644 --- a/reactos/dll/directx/wine/d3dx9_40/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3dx9_40/CMakeLists.txt @@ -1,4 +1,3 @@ -set_rc_compiler() spec2def(d3dx9_40.dll d3dx9_40.spec) @@ -8,14 +7,10 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_40.def) add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - add_library(d3dx9_40 SHARED ${SOURCE}) set_module_type(d3dx9_40 win32dll) - -target_link_libraries(d3dx9_40 - wine) +target_link_libraries(d3dx9_40 wine) add_importlibs(d3dx9_40 d3dx9_36 diff --git a/reactos/dll/directx/wine/d3dx9_41/CMakeLists.txt b/reactos/dll/directx/wine/d3dx9_41/CMakeLists.txt index 4a6b5d5d73a..c30de705f62 100644 --- a/reactos/dll/directx/wine/d3dx9_41/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3dx9_41/CMakeLists.txt @@ -1,4 +1,3 @@ -set_rc_compiler() spec2def(d3dx9_41.dll d3dx9_41.spec) @@ -8,14 +7,10 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_41.def) add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - add_library(d3dx9_41 SHARED ${SOURCE}) set_module_type(d3dx9_41 win32dll) - -target_link_libraries(d3dx9_41 - wine) +target_link_libraries(d3dx9_41 wine) add_importlibs(d3dx9_41 d3dx9_36 diff --git a/reactos/dll/directx/wine/d3dx9_42/CMakeLists.txt b/reactos/dll/directx/wine/d3dx9_42/CMakeLists.txt index 0bcaa8ccb37..ac7b09bf175 100644 --- a/reactos/dll/directx/wine/d3dx9_42/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3dx9_42/CMakeLists.txt @@ -1,4 +1,3 @@ -set_rc_compiler() spec2def(d3dx9_42.dll d3dx9_42.spec) @@ -8,14 +7,10 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_42.def) add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - add_library(d3dx9_42 SHARED ${SOURCE}) set_module_type(d3dx9_42 win32dll) - -target_link_libraries(d3dx9_42 - wine) +target_link_libraries(d3dx9_42 wine) add_importlibs(d3dx9_42 d3dx9_36 diff --git a/reactos/dll/shellext/deskadp/CMakeLists.txt b/reactos/dll/shellext/deskadp/CMakeLists.txt index 6961c6a05ff..429cb9ea7c6 100644 --- a/reactos/dll/shellext/deskadp/CMakeLists.txt +++ b/reactos/dll/shellext/deskadp/CMakeLists.txt @@ -1,5 +1,4 @@ -set_rc_compiler() spec2def(deskadp.dll deskadp.spec) list(APPEND SOURCE @@ -9,9 +8,7 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/deskadp.def) add_library(deskadp SHARED ${SOURCE}) - set_module_type(deskadp win32dll UNICODE) - target_link_libraries(deskadp uuid) add_importlibs(deskadp @@ -24,5 +21,4 @@ add_importlibs(deskadp ntdll) add_pch(deskadp precomp.h) - add_cd_file(TARGET deskadp DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/shellext/deskmon/CMakeLists.txt b/reactos/dll/shellext/deskmon/CMakeLists.txt index e61d5c40f77..e8e407588dc 100644 --- a/reactos/dll/shellext/deskmon/CMakeLists.txt +++ b/reactos/dll/shellext/deskmon/CMakeLists.txt @@ -1,6 +1,4 @@ -set_rc_compiler() - spec2def(deskmon.dll deskmon.spec) list(APPEND SOURCE @@ -10,9 +8,7 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/deskmon.def) add_library(deskmon SHARED ${SOURCE}) - set_module_type(deskmon win32dll UNICODE) - target_link_libraries(deskmon uuid) add_importlibs(deskmon @@ -25,5 +21,4 @@ add_importlibs(deskmon ntdll) add_pch(deskmon precomp.h) - add_cd_file(TARGET deskmon DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/shellext/devcpux/CMakeLists.txt b/reactos/dll/shellext/devcpux/CMakeLists.txt index 969ec27196f..263501c19e1 100644 --- a/reactos/dll/shellext/devcpux/CMakeLists.txt +++ b/reactos/dll/shellext/devcpux/CMakeLists.txt @@ -1,10 +1,6 @@ -set_rc_compiler() - spec2def(devcpux.dll devcpux.spec) - add_library(devcpux SHARED processor.c processor.rc ${CMAKE_CURRENT_BINARY_DIR}/devcpux.def) - set_module_type(devcpux win32dll UNICODE) add_importlibs(devcpux diff --git a/reactos/dll/shellext/fontext/CMakeLists.txt b/reactos/dll/shellext/fontext/CMakeLists.txt index 4257de39194..e17d4d80f45 100644 --- a/reactos/dll/shellext/fontext/CMakeLists.txt +++ b/reactos/dll/shellext/fontext/CMakeLists.txt @@ -1,5 +1,4 @@ -set_rc_compiler() spec2def(fontext.dll fontext.spec) add_library(fontext SHARED @@ -9,7 +8,6 @@ add_library(fontext SHARED ${CMAKE_CURRENT_BINARY_DIR}/fontext.def) set_module_type(fontext win32dll UNICODE) - target_link_libraries(fontext uuid) add_importlibs(fontext diff --git a/reactos/dll/shellext/slayer/CMakeLists.txt b/reactos/dll/shellext/slayer/CMakeLists.txt index 417a88ddadc..635c1691763 100644 --- a/reactos/dll/shellext/slayer/CMakeLists.txt +++ b/reactos/dll/shellext/slayer/CMakeLists.txt @@ -1,6 +1,4 @@ -set_rc_compiler() - spec2def(slayer.dll slayer.spec) list(APPEND SOURCE @@ -9,9 +7,7 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/slayer.def) add_library(slayer SHARED ${SOURCE}) - set_module_type(slayer win32dll UNICODE) - target_link_libraries(slayer uuid) add_importlibs(slayer @@ -25,5 +21,4 @@ add_importlibs(slayer ntdll) add_pch(slayer precomp.h) - add_cd_file(TARGET slayer DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/acledit/CMakeLists.txt b/reactos/dll/win32/acledit/CMakeLists.txt index e49f5eaa7e4..cf3f752ed3c 100644 --- a/reactos/dll/win32/acledit/CMakeLists.txt +++ b/reactos/dll/win32/acledit/CMakeLists.txt @@ -1,5 +1,4 @@ -set_rc_compiler() spec2def(acledit.dll acledit.spec) list(APPEND SOURCE @@ -9,9 +8,7 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/acledit.def) add_library(acledit SHARED ${SOURCE}) - set_module_type(acledit win32dll UNICODE) add_importlibs(acledit msvcrt kernel32 ntdll) add_pch(acledit acleditint.h) add_cd_file(TARGET acledit DESTINATION reactos/system32 FOR all) - diff --git a/reactos/dll/win32/aclui/CMakeLists.txt b/reactos/dll/win32/aclui/CMakeLists.txt index a730b9849c2..11eedfc9af4 100644 --- a/reactos/dll/win32/aclui/CMakeLists.txt +++ b/reactos/dll/win32/aclui/CMakeLists.txt @@ -1,6 +1,5 @@ spec2def(aclui.dll aclui.spec) -set_rc_compiler() add_definitions(-DSUPPORT_UXTHEME) @@ -12,9 +11,7 @@ list(APPEND SOURCE sidcache.c ${CMAKE_CURRENT_BINARY_DIR}/aclui.def) -add_library(aclui SHARED - ${SOURCE} - aclui.rc) +add_library(aclui SHARED ${SOURCE} aclui.rc) if(NOT MSVC) # FIXME: http://www.cmake.org/Bug/view.php?id=12998 @@ -23,7 +20,6 @@ if(NOT MSVC) endif() set_module_type(aclui win32dll UNICODE) - add_importlibs(aclui user32 gdi32 comctl32 ole32 oleaut32 advapi32 uxtheme msvcrt kernel32 ntdll) add_pch(aclui precomp.h) add_cd_file(TARGET aclui DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/avifil32/CMakeLists.txt b/reactos/dll/win32/avifil32/CMakeLists.txt index 813d1ad4e36..e316d80daec 100644 --- a/reactos/dll/win32/avifil32/CMakeLists.txt +++ b/reactos/dll/win32/avifil32/CMakeLists.txt @@ -1,13 +1,9 @@ -add_definitions(-D__WINESRC__) - remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) +add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - -set_rc_compiler() - spec2def(avifil32.dll avifil32.spec ADD_IMPORTLIB) add_library(avifil32 SHARED @@ -25,7 +21,6 @@ add_library(avifil32 SHARED ${CMAKE_CURRENT_BINARY_DIR}/avifil32.def) set_module_type(avifil32 win32dll) - target_link_libraries(avifil32 uuid wine) add_importlibs(avifil32 @@ -39,5 +34,4 @@ add_importlibs(avifil32 kernel32 ntdll) - add_cd_file(TARGET avifil32 DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/batt/CMakeLists.txt b/reactos/dll/win32/batt/CMakeLists.txt index a51293b749e..cfd7f25fc13 100644 --- a/reactos/dll/win32/batt/CMakeLists.txt +++ b/reactos/dll/win32/batt/CMakeLists.txt @@ -1,17 +1,11 @@ spec2def(batt.dll batt.spec) -set_rc_compiler() - add_library(batt SHARED batt.c batt.rc ${CMAKE_CURRENT_BINARY_DIR}/batt.def) set_module_type(batt win32dll UNICODE) - - - add_importlibs(batt msvcrt kernel32 ntdll) - add_cd_file(TARGET batt DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/bcrypt/CMakeLists.txt b/reactos/dll/win32/bcrypt/CMakeLists.txt index d618a818321..a3aa1d82cf2 100644 --- a/reactos/dll/win32/bcrypt/CMakeLists.txt +++ b/reactos/dll/win32/bcrypt/CMakeLists.txt @@ -1,8 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - -set_rc_compiler() spec2def(bcrypt.dll bcrypt.spec) list(APPEND SOURCE @@ -13,9 +11,6 @@ list(APPEND SOURCE add_library(bcrypt SHARED ${SOURCE}) set_module_type(bcrypt win32dll) - target_link_libraries(bcrypt wine) - add_importlibs(bcrypt msvcrt kernel32 ntdll) - add_cd_file(TARGET bcrypt DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/cards/CMakeLists.txt b/reactos/dll/win32/cards/CMakeLists.txt index 5578bbcd949..b2548675a8b 100644 --- a/reactos/dll/win32/cards/CMakeLists.txt +++ b/reactos/dll/win32/cards/CMakeLists.txt @@ -1,10 +1,7 @@ - # Possible definitions: CARDSTYLE_DEFAULT or CARDSTYLE_BAVARIAN add_definitions(-DCARDSTYLE_DEFAULT) -set_rc_compiler() - spec2def(cards.dll cards.spec) list(APPEND SOURCE @@ -13,8 +10,6 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/cards.def) add_library(cards SHARED ${SOURCE}) - set_module_type(cards win32dll UNICODE) add_importlibs(cards user32 gdi32 msvcrt kernel32) - add_cd_file(TARGET cards DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/clusapi/CMakeLists.txt b/reactos/dll/win32/clusapi/CMakeLists.txt index c80015b6efb..cff38949d7a 100644 --- a/reactos/dll/win32/clusapi/CMakeLists.txt +++ b/reactos/dll/win32/clusapi/CMakeLists.txt @@ -1,9 +1,6 @@ add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - -set_rc_compiler() spec2def(clusapi.dll clusapi.spec) list(APPEND SOURCE @@ -12,11 +9,7 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/clusapi.def) add_library(clusapi SHARED ${SOURCE}) - set_module_type(clusapi win32dll) - target_link_libraries(clusapi wine) - add_importlibs(clusapi msvcrt kernel32 ntdll) - add_cd_file(TARGET clusapi DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/comctl32/CMakeLists.txt b/reactos/dll/win32/comctl32/CMakeLists.txt index 1b9d877f7f6..392abeffe73 100644 --- a/reactos/dll/win32/comctl32/CMakeLists.txt +++ b/reactos/dll/win32/comctl32/CMakeLists.txt @@ -1,6 +1,4 @@ -set_rc_compiler() - add_definitions( -D__WINESRC__ -D_WINE @@ -10,7 +8,6 @@ remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(comctl32.dll comctl32.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -69,4 +66,3 @@ add_importlibs(comctl32 add_pch(comctl32 comctl32.h) add_cd_file(TARGET comctl32 DESTINATION reactos/system32 FOR all) - diff --git a/reactos/dll/win32/comdlg32/CMakeLists.txt b/reactos/dll/win32/comdlg32/CMakeLists.txt index 62af43c2ea7..51e2811eae5 100644 --- a/reactos/dll/win32/comdlg32/CMakeLists.txt +++ b/reactos/dll/win32/comdlg32/CMakeLists.txt @@ -4,9 +4,6 @@ add_definitions( -D_WINE) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - -set_rc_compiler() - spec2def(comdlg32.dll comdlg32.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -41,4 +38,3 @@ add_importlibs(comdlg32 ntdll) add_cd_file(TARGET comdlg32 DESTINATION reactos/system32 FOR all) - diff --git a/reactos/dll/win32/credui/CMakeLists.txt b/reactos/dll/win32/credui/CMakeLists.txt index c13ccf3f2bc..1ab2441d6b3 100644 --- a/reactos/dll/win32/credui/CMakeLists.txt +++ b/reactos/dll/win32/credui/CMakeLists.txt @@ -1,10 +1,6 @@ add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - -set_rc_compiler() - spec2def(credui.dll credui.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -14,11 +10,7 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/credui.def) add_library(credui SHARED ${SOURCE}) - set_module_type(credui win32dll) - target_link_libraries(credui wine) - add_importlibs(credui advapi32 user32 comctl32 msvcrt kernel32 ntdll) - add_cd_file(TARGET credui DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/crypt32/CMakeLists.txt b/reactos/dll/win32/crypt32/CMakeLists.txt index d5439d4706b..7a68dff846e 100644 --- a/reactos/dll/win32/crypt32/CMakeLists.txt +++ b/reactos/dll/win32/crypt32/CMakeLists.txt @@ -7,9 +7,6 @@ remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - -set_rc_compiler() - spec2def(crypt32.dll crypt32.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -40,9 +37,7 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/crypt32_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/crypt32.def) -add_library(crypt32 SHARED - ${SOURCE} - crypt32.rc) +add_library(crypt32 SHARED ${SOURCE} crypt32.rc) if(NOT MSVC) # FIXME: http://www.cmake.org/Bug/view.php?id=12998 @@ -54,4 +49,3 @@ set_module_type(crypt32 win32dll) target_link_libraries(crypt32 wine ${PSEH_LIB} oldnames) add_importlibs(crypt32 user32 advapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET crypt32 DESTINATION reactos/system32 FOR all) - diff --git a/reactos/dll/win32/cryptdlg/CMakeLists.txt b/reactos/dll/win32/cryptdlg/CMakeLists.txt index 8dc706b3603..31f1d22538d 100644 --- a/reactos/dll/win32/cryptdlg/CMakeLists.txt +++ b/reactos/dll/win32/cryptdlg/CMakeLists.txt @@ -2,8 +2,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -set_rc_compiler() - spec2def(cryptdlg.dll cryptdlg.spec) list(APPEND SOURCE @@ -13,9 +11,7 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/cryptdlg.def) add_library(cryptdlg SHARED ${SOURCE}) - set_module_type(cryptdlg win32dll) - target_link_libraries(cryptdlg wine) add_importlibs(cryptdlg diff --git a/reactos/dll/win32/dbghelp/CMakeLists.txt b/reactos/dll/win32/dbghelp/CMakeLists.txt index 82a4ffe3e0f..d4508f64466 100644 --- a/reactos/dll/win32/dbghelp/CMakeLists.txt +++ b/reactos/dll/win32/dbghelp/CMakeLists.txt @@ -11,9 +11,6 @@ if(ARCH STREQUAL "amd64") endif() include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - -set_rc_compiler() - spec2def(dbghelp.dll dbghelp.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -45,9 +42,7 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/dbghelp_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/dbghelp.def) -add_library(dbghelp SHARED - ${SOURCE} - version.rc) +add_library(dbghelp SHARED ${SOURCE} version.rc) if(NOT MSVC) # FIXME: http://www.cmake.org/Bug/view.php?id=12998 @@ -60,6 +55,4 @@ target_link_libraries(dbghelp wine ${PSEH_LIB} oldnames) add_delay_importlibs(dbghelp version) add_importlibs(dbghelp psapi msvcrt kernel32 ntdll) add_pch(dbghelp dbghelp_private.h) - - add_cd_file(TARGET dbghelp DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/dciman32/CMakeLists.txt b/reactos/dll/win32/dciman32/CMakeLists.txt index 038d75a7356..916a842443e 100644 --- a/reactos/dll/win32/dciman32/CMakeLists.txt +++ b/reactos/dll/win32/dciman32/CMakeLists.txt @@ -1,10 +1,6 @@ add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - -set_rc_compiler() - spec2def(dciman32.dll dciman32.spec) list(APPEND SOURCE @@ -13,7 +9,6 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/dciman32.def) add_library(dciman32 SHARED ${SOURCE}) - set_module_type(dciman32 win32dll) target_link_libraries(dciman32 wine) add_importlibs(dciman32 msvcrt kernel32 ntdll) diff --git a/reactos/dll/win32/devmgr/CMakeLists.txt b/reactos/dll/win32/devmgr/CMakeLists.txt index 0e5b20890b9..af6aa323785 100644 --- a/reactos/dll/win32/devmgr/CMakeLists.txt +++ b/reactos/dll/win32/devmgr/CMakeLists.txt @@ -1,6 +1,4 @@ -set_rc_compiler() - spec2def(devmgr.dll devmgr.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -14,9 +12,7 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/devmgr.def) add_library(devmgr SHARED ${SOURCE}) - set_module_type(devmgr win32dll UNICODE) - target_link_libraries(devmgr uuid wine) add_importlibs(devmgr @@ -29,6 +25,4 @@ add_importlibs(devmgr ntdll) add_pch(devmgr precomp.h) - add_cd_file(TARGET devmgr DESTINATION reactos/system32 FOR all) - diff --git a/reactos/dll/win32/dwmapi/CMakeLists.txt b/reactos/dll/win32/dwmapi/CMakeLists.txt index 5f775cf2f77..9c7540209cb 100644 --- a/reactos/dll/win32/dwmapi/CMakeLists.txt +++ b/reactos/dll/win32/dwmapi/CMakeLists.txt @@ -1,10 +1,7 @@ add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -set_rc_compiler() - spec2def(dwmapi.dll dwmapi.spec) list(APPEND SOURCE @@ -14,7 +11,6 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/dwmapi.def) add_library(dwmapi SHARED ${SOURCE}) - set_module_type(dwmapi win32dll) target_link_libraries(dwmapi wine) add_importlibs(dwmapi msvcrt kernel32 ntdll) diff --git a/reactos/dll/win32/faultrep/CMakeLists.txt b/reactos/dll/win32/faultrep/CMakeLists.txt index 38147a4ce28..38fc4f46694 100644 --- a/reactos/dll/win32/faultrep/CMakeLists.txt +++ b/reactos/dll/win32/faultrep/CMakeLists.txt @@ -1,19 +1,14 @@ add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - -set_rc_compiler() - spec2def(faultrep.dll faultrep.spec) list(APPEND SOURCE faultrep.c ${CMAKE_CURRENT_BINARY_DIR}/faultrep_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/faultrep.def) - -add_library(faultrep SHARED ${SOURCE}) +add_library(faultrep SHARED ${SOURCE}) set_module_type(faultrep win32dll) target_link_libraries(faultrep wine) add_importlibs(faultrep advapi32 msvcrt kernel32 ntdll) diff --git a/reactos/dll/win32/hhctrl.ocx/CMakeLists.txt b/reactos/dll/win32/hhctrl.ocx/CMakeLists.txt index 88f1a764a62..cdf7499088b 100644 --- a/reactos/dll/win32/hhctrl.ocx/CMakeLists.txt +++ b/reactos/dll/win32/hhctrl.ocx/CMakeLists.txt @@ -1,12 +1,9 @@ -add_definitions(-D__WINESRC__) - remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) +add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - -set_rc_compiler() spec2def(hhctrl.ocx hhctrl.ocx.spec) add_library(hhctrl SHARED @@ -23,7 +20,6 @@ add_library(hhctrl SHARED ${CMAKE_CURRENT_BINARY_DIR}/hhctrl.def) set_module_type(hhctrl win32ocx) - target_link_libraries(hhctrl uuid wine itss_guid) add_importlibs(hhctrl diff --git a/reactos/dll/win32/hnetcfg/CMakeLists.txt b/reactos/dll/win32/hnetcfg/CMakeLists.txt index ccba7e25607..3b9a3f06a1e 100644 --- a/reactos/dll/win32/hnetcfg/CMakeLists.txt +++ b/reactos/dll/win32/hnetcfg/CMakeLists.txt @@ -1,12 +1,9 @@ -add_definitions(-D__WINESRC__) - remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) +add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - -set_rc_compiler() spec2def(hnetcfg.dll hnetcfg.spec) list(APPEND SOURCE @@ -21,9 +18,7 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/hnetcfg.def) add_library(hnetcfg SHARED ${SOURCE}) - set_module_type(hnetcfg win32dll) - target_link_libraries(hnetcfg wine uuid) add_importlibs(hnetcfg diff --git a/reactos/dll/win32/iccvid/CMakeLists.txt b/reactos/dll/win32/iccvid/CMakeLists.txt index 736e776272f..f93b2b900a3 100644 --- a/reactos/dll/win32/iccvid/CMakeLists.txt +++ b/reactos/dll/win32/iccvid/CMakeLists.txt @@ -1,10 +1,6 @@ add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - -set_rc_compiler() - spec2def(iccvid.dll iccvid.spec) list(APPEND SOURCE @@ -13,7 +9,6 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/iccvid.def) add_library(iccvid SHARED ${SOURCE}) - set_module_type(iccvid win32dll) target_link_libraries(iccvid wine) add_importlibs(iccvid user32 msvcrt kernel32 ntdll) diff --git a/reactos/dll/win32/icmp/CMakeLists.txt b/reactos/dll/win32/icmp/CMakeLists.txt index 4e0d105171e..d231d3aa682 100644 --- a/reactos/dll/win32/icmp/CMakeLists.txt +++ b/reactos/dll/win32/icmp/CMakeLists.txt @@ -1,8 +1,5 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - -set_rc_compiler() - spec2def(icmp.dll icmp.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -12,10 +9,7 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/icmp.def) add_library(icmp SHARED ${SOURCE}) - set_module_type(icmp win32dll) - target_link_libraries(icmp wine) add_importlibs(icmp ws2_32 msvcrt kernel32 ntdll) - add_cd_file(TARGET icmp DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/inetcomm/CMakeLists.txt b/reactos/dll/win32/inetcomm/CMakeLists.txt index 5d17403742a..3a60d7943f0 100644 --- a/reactos/dll/win32/inetcomm/CMakeLists.txt +++ b/reactos/dll/win32/inetcomm/CMakeLists.txt @@ -1,12 +1,9 @@ -add_definitions(-D__WINESRC__) - remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) +add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - -set_rc_compiler() spec2def(inetcomm.dll inetcomm.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -22,9 +19,7 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/inetcomm.def) add_library(inetcomm SHARED ${SOURCE}) - set_module_type(inetcomm win32dll) - target_link_libraries(inetcomm uuid wine) add_importlibs(inetcomm @@ -37,5 +32,4 @@ add_importlibs(inetcomm kernel32 ntdll) - add_cd_file(TARGET inetcomm DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/inseng/CMakeLists.txt b/reactos/dll/win32/inseng/CMakeLists.txt index 3f94ff82bc4..5a59c7d0cc2 100644 --- a/reactos/dll/win32/inseng/CMakeLists.txt +++ b/reactos/dll/win32/inseng/CMakeLists.txt @@ -1,12 +1,9 @@ -add_definitions(-D__WINESRC__) - remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) +add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - -set_rc_compiler() spec2def(inseng.dll inseng.spec) list(APPEND SOURCE @@ -16,9 +13,7 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/inseng.def) add_library(inseng SHARED ${SOURCE}) - set_module_type(inseng win32dll) - target_link_libraries(inseng uuid wine) add_importlibs(inseng diff --git a/reactos/dll/win32/kernel32/CMakeLists.txt b/reactos/dll/win32/kernel32/CMakeLists.txt index ad5a2a3bded..efc98c9dd8c 100644 --- a/reactos/dll/win32/kernel32/CMakeLists.txt +++ b/reactos/dll/win32/kernel32/CMakeLists.txt @@ -1,10 +1,6 @@ add_definitions(-D_KERNEL32_) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys) - -set_rc_compiler() - spec2def(kernel32.dll kernel32.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -80,23 +76,19 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/kernel32.def) if(ARCH STREQUAL "i386") -list(APPEND SOURCE - client/i386/fiber.S - client/i386/thread.S) + list(APPEND SOURCE + client/i386/fiber.S + client/i386/thread.S) elseif(ARCH STREQUAL "amd64") -list(APPEND SOURCE - client/amd64/fiber.S - client/amd64/thread.S) -endif(ARCH STREQUAL "i386") + list(APPEND SOURCE + client/amd64/fiber.S + client/amd64/thread.S) +endif() add_library(kernel32 SHARED ${SOURCE}) - set_module_type(kernel32 win32dll ENTRYPOINT DllMain 12) - target_link_libraries(kernel32 wine chkstk ${PSEH_LIB}) - add_importlibs(kernel32 ntdll) add_pch(kernel32 k32.h) add_dependencies(kernel32 psdk errcodes asm) add_cd_file(TARGET kernel32 DESTINATION reactos/system32 FOR all) - diff --git a/reactos/dll/win32/localspl/CMakeLists.txt b/reactos/dll/win32/localspl/CMakeLists.txt index e0166044db0..9f97104abe8 100644 --- a/reactos/dll/win32/localspl/CMakeLists.txt +++ b/reactos/dll/win32/localspl/CMakeLists.txt @@ -1,13 +1,9 @@ -add_definitions(-D__WINESRC__) - remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) +add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - -set_rc_compiler() - spec2def(localspl.dll localspl.spec) list(APPEND SOURCE @@ -17,12 +13,8 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/localspl_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/localspl.def) -add_library(localspl SHARED - ${SOURCE} - localspl.rc) - +add_library(localspl SHARED ${SOURCE} localspl.rc) set_module_type(localspl win32dll) - target_link_libraries(localspl wine) add_importlibs(localspl @@ -40,4 +32,3 @@ if(NOT MSVC) #allow_warnings(localspl) set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error") endif() - diff --git a/reactos/dll/win32/localui/CMakeLists.txt b/reactos/dll/win32/localui/CMakeLists.txt index 5aab4d291dd..43ff2f27fb3 100644 --- a/reactos/dll/win32/localui/CMakeLists.txt +++ b/reactos/dll/win32/localui/CMakeLists.txt @@ -1,9 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - -set_rc_compiler() - spec2def(localui.dll localui.spec) list(APPEND SOURCE @@ -12,10 +9,7 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/localui.def) add_library(localui SHARED ${SOURCE}) - set_module_type(localui win32dll) target_link_libraries(localui uuid wine) - - add_importlibs(localui winspool user32 msvcrt kernel32 ntdll) add_cd_file(TARGET localui DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/lsasrv/CMakeLists.txt b/reactos/dll/win32/lsasrv/CMakeLists.txt index a68f0ec1f49..ba3b44933e7 100644 --- a/reactos/dll/win32/lsasrv/CMakeLists.txt +++ b/reactos/dll/win32/lsasrv/CMakeLists.txt @@ -5,9 +5,6 @@ include_directories( ${REACTOS_SOURCE_DIR}/include/reactos/subsys/lsass) add_rpc_files(server ${REACTOS_SOURCE_DIR}/include/reactos/idl/lsa.idl) - -set_rc_compiler() - spec2def(lsasrv.dll lsasrv.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -27,10 +24,8 @@ list(APPEND SOURCE add_library(lsasrv SHARED ${SOURCE}) set_module_type(lsasrv win32dll ENTRYPOINT 0 UNICODE) - target_link_libraries(lsasrv wine ${PSEH_LIB}) add_importlibs(lsasrv samsrv rpcrt4 msvcrt kernel32 advapi32 ntdll) add_pch(lsasrv lsasrv.h) add_dependencies(lsasrv psdk) add_cd_file(TARGET lsasrv DESTINATION reactos/system32 FOR all) - diff --git a/reactos/dll/win32/mapi32/CMakeLists.txt b/reactos/dll/win32/mapi32/CMakeLists.txt index 5c1484e7485..dc5835d0c0f 100644 --- a/reactos/dll/win32/mapi32/CMakeLists.txt +++ b/reactos/dll/win32/mapi32/CMakeLists.txt @@ -1,9 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - -set_rc_compiler() - spec2def(mapi32.dll mapi32.spec) list(APPEND SOURCE @@ -18,9 +15,7 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/mapi32.def) add_library(mapi32 SHARED ${SOURCE}) - set_module_type(mapi32 win32dll) - target_link_libraries(mapi32 wine uuid) add_importlibs(mapi32 shlwapi shell32 user32 advapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET mapi32 DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/modemui/CMakeLists.txt b/reactos/dll/win32/modemui/CMakeLists.txt index d1e3b77b9ab..3953a52f4f5 100644 --- a/reactos/dll/win32/modemui/CMakeLists.txt +++ b/reactos/dll/win32/modemui/CMakeLists.txt @@ -1,6 +1,4 @@ -set_rc_compiler() - spec2def(modemui.dll modemui.spec) list(APPEND SOURCE @@ -10,7 +8,6 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/modemui.def) add_library(modemui SHARED ${SOURCE}) - set_module_type(modemui win32dll UNICODE) add_importlibs(modemui msvcrt kernel32 ntdll) add_cd_file(TARGET modemui DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/mpr/CMakeLists.txt b/reactos/dll/win32/mpr/CMakeLists.txt index 575703c06ab..72bfc3d31d1 100644 --- a/reactos/dll/win32/mpr/CMakeLists.txt +++ b/reactos/dll/win32/mpr/CMakeLists.txt @@ -4,9 +4,6 @@ add_definitions( -D_WINE) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - -set_rc_compiler() - spec2def(mpr.dll mpr.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -21,10 +18,7 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/mpr.def) add_library(mpr SHARED ${SOURCE}) - set_module_type(mpr win32dll) - target_link_libraries(mpr wine) add_importlibs(mpr advapi32 user32 msvcrt kernel32 ntdll) add_cd_file(TARGET mpr DESTINATION reactos/system32 FOR all) - diff --git a/reactos/dll/win32/msacm32/CMakeLists.txt b/reactos/dll/win32/msacm32/CMakeLists.txt index 9158bc265ce..ceb02c74a3c 100644 --- a/reactos/dll/win32/msacm32/CMakeLists.txt +++ b/reactos/dll/win32/msacm32/CMakeLists.txt @@ -1,9 +1,5 @@ - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - -set_rc_compiler() - spec2def(msacm32.dll msacm32.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -18,14 +14,10 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/msacm32.def) add_library(msacm32 SHARED ${SOURCE}) - set_module_type(msacm32 win32dll ENTRYPOINT DllMain 12 UNICODE) - target_link_libraries(msacm32 wine) add_importlibs(msacm32 msvcrt advapi32 user32 winmm kernel32 ntdll) add_dependencies(msacm32 psdk) - add_cd_file(TARGET msacm32 DESTINATION reactos/system32 FOR all) - add_subdirectory(msacm32.drv) diff --git a/reactos/dll/win32/msftedit/CMakeLists.txt b/reactos/dll/win32/msftedit/CMakeLists.txt index 89b40b56f31..2888fa6768b 100644 --- a/reactos/dll/win32/msftedit/CMakeLists.txt +++ b/reactos/dll/win32/msftedit/CMakeLists.txt @@ -1,9 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - -set_rc_compiler() - spec2def(msftedit.dll msftedit.spec) list(APPEND SOURCE @@ -13,9 +10,7 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/msftedit.def) add_library(msftedit SHARED ${SOURCE}) - set_module_type(msftedit win32dll) - target_link_libraries(msftedit uuid wine) add_importlibs(msftedit riched20 msvcrt kernel32 ntdll) add_cd_file(TARGET msftedit DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/msgina/CMakeLists.txt b/reactos/dll/win32/msgina/CMakeLists.txt index 17a98b30540..9524d6d64f1 100644 --- a/reactos/dll/win32/msgina/CMakeLists.txt +++ b/reactos/dll/win32/msgina/CMakeLists.txt @@ -3,8 +3,6 @@ include_directories( include ${REACTOS_SOURCE_DIR}/include/reactos/wine) -set_rc_compiler() - spec2def(msgina.dll msgina.spec) list(APPEND SOURCE diff --git a/reactos/dll/win32/mshtml/CMakeLists.txt b/reactos/dll/win32/mshtml/CMakeLists.txt index 755279ddb3f..5d5fbd64fb7 100644 --- a/reactos/dll/win32/mshtml/CMakeLists.txt +++ b/reactos/dll/win32/mshtml/CMakeLists.txt @@ -4,11 +4,7 @@ add_definitions(-D_WIN32_WINNT=0x600) add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - add_idl_Headers(mshtml_nsiface_header nsiface.idl) - -set_rc_compiler() - spec2def(mshtml.dll mshtml.spec) list(APPEND SOURCE diff --git a/reactos/dll/win32/msimtf/CMakeLists.txt b/reactos/dll/win32/msimtf/CMakeLists.txt index 3832d3f787b..659c0f1cc9a 100644 --- a/reactos/dll/win32/msimtf/CMakeLists.txt +++ b/reactos/dll/win32/msimtf/CMakeLists.txt @@ -1,9 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - -set_rc_compiler() - spec2def(msimtf.dll msimtf.spec) list(APPEND SOURCE @@ -14,9 +11,7 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/msimtf.def) add_library(msimtf SHARED ${SOURCE}) - set_module_type(msimtf win32dll) - target_link_libraries(msimtf uuid wine) add_importlibs(msimtf msvcrt imm32 kernel32 ntdll) add_cd_file(TARGET msimtf DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/msrle32/CMakeLists.txt b/reactos/dll/win32/msrle32/CMakeLists.txt index b79aa8bd5f8..6c3a8c884cf 100644 --- a/reactos/dll/win32/msrle32/CMakeLists.txt +++ b/reactos/dll/win32/msrle32/CMakeLists.txt @@ -1,9 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - -set_rc_compiler() - spec2def(msrle32.dll msrle32.spec) list(APPEND SOURCE @@ -12,7 +9,6 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/msrle32.def) add_library(msrle32 SHARED ${SOURCE}) - set_module_type(msrle32 win32dll) target_link_libraries(msrle32 wine) add_importlibs(msrle32 msvcrt winmm user32 kernel32 ntdll) diff --git a/reactos/dll/win32/mstask/CMakeLists.txt b/reactos/dll/win32/mstask/CMakeLists.txt index b0880679f4e..9c1183c1da4 100644 --- a/reactos/dll/win32/mstask/CMakeLists.txt +++ b/reactos/dll/win32/mstask/CMakeLists.txt @@ -1,18 +1,13 @@ -add_definitions(-D__WINESRC__) - remove_definitions(-DWINVER=0x502) add_definitions(-DWINVER=0x600) remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) +add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - -set_rc_compiler() - generate_idl_iids(mstask_local.idl) - spec2def(mstask.dll mstask.spec) list(APPEND SOURCE diff --git a/reactos/dll/win32/msvcrt/CMakeLists.txt b/reactos/dll/win32/msvcrt/CMakeLists.txt index 209877c8940..728d7568bce 100644 --- a/reactos/dll/win32/msvcrt/CMakeLists.txt +++ b/reactos/dll/win32/msvcrt/CMakeLists.txt @@ -1,4 +1,5 @@ +include_directories(${REACTOS_SOURCE_DIR}/lib/sdk/crt/include) spec2def(msvcrt.dll msvcrt.spec ADD_IMPORTLIB) add_definitions( @@ -11,10 +12,6 @@ add_definitions( -DCRTDLL -D__MINGW_IMPORT="") -include_directories(${REACTOS_SOURCE_DIR}/lib/sdk/crt/include) - -set_rc_compiler() - list(APPEND SOURCE dllmain.c stubs.c @@ -22,11 +19,8 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/msvcrt.def) add_library(msvcrt SHARED ${SOURCE}) - set_module_type(msvcrt win32dll ENTRYPOINT DllMain 12) - add_dependencies(msvcrt psdk) - target_link_libraries(msvcrt crt wine ${PSEH_LIB}) if(MSVC) @@ -37,4 +31,3 @@ endif() add_importlibs(msvcrt kernel32 ntdll) add_pch(msvcrt precomp.h) add_cd_file(TARGET msvcrt DESTINATION reactos/system32 FOR all) - diff --git a/reactos/dll/win32/msvfw32/CMakeLists.txt b/reactos/dll/win32/msvfw32/CMakeLists.txt index 17679ebac17..2f5b29efda7 100644 --- a/reactos/dll/win32/msvfw32/CMakeLists.txt +++ b/reactos/dll/win32/msvfw32/CMakeLists.txt @@ -4,7 +4,6 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) add_definitions(-D_WINE) -set_rc_compiler() spec2def(msvfw32.dll msvfw32.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -16,12 +15,7 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/msvfw32.def) add_library(msvfw32 SHARED ${SOURCE}) - set_module_type(msvfw32 win32dll) - target_link_libraries(msvfw32 wine) - add_importlibs(msvfw32 winmm version comctl32 user32 gdi32 advapi32 msvcrt kernel32 ntdll) - add_cd_file(TARGET msvfw32 DESTINATION reactos/system32 FOR all) - diff --git a/reactos/dll/win32/netcfgx/CMakeLists.txt b/reactos/dll/win32/netcfgx/CMakeLists.txt index 2811d36dda6..8f182b0efed 100644 --- a/reactos/dll/win32/netcfgx/CMakeLists.txt +++ b/reactos/dll/win32/netcfgx/CMakeLists.txt @@ -1,7 +1,6 @@ remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) -set_rc_compiler() spec2def(netcfgx.dll netcfgx.spec) list(APPEND SOURCE @@ -15,13 +14,8 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/netcfgx.def) add_library(netcfgx SHARED ${SOURCE}) - set_module_type(netcfgx win32dll) - -target_link_libraries(netcfgx - uuid - wine) - +target_link_libraries(netcfgx uuid wine) add_importlibs(netcfgx rpcrt4 setupapi advapi32 iphlpapi dhcpcsvc ole32 user32 comctl32 ws2_32 msvcrt kernel32 ntdll) add_pch(netcfgx precomp.h) add_cd_file(TARGET netcfgx DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/netid/CMakeLists.txt b/reactos/dll/win32/netid/CMakeLists.txt index bb729051426..0bdd5e9d66f 100644 --- a/reactos/dll/win32/netid/CMakeLists.txt +++ b/reactos/dll/win32/netid/CMakeLists.txt @@ -1,6 +1,5 @@ spec2def(netid.dll netid.spec) -set_rc_compiler() list(APPEND SOURCE netid.c @@ -8,7 +7,6 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/netid.def) add_library(netid SHARED ${SOURCE}) - set_module_type(netid win32dll UNICODE) add_importlibs(netid user32 gdi32 comctl32 advapi32 netapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET netid DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/netshell/CMakeLists.txt b/reactos/dll/win32/netshell/CMakeLists.txt index f7d1a6f1d73..ad3b61e7820 100644 --- a/reactos/dll/win32/netshell/CMakeLists.txt +++ b/reactos/dll/win32/netshell/CMakeLists.txt @@ -1,9 +1,9 @@ -add_definitions(-D_NETSHELL_) + remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) +add_definitions(-D_NETSHELL_) set_cpp() -set_rc_compiler() spec2def(netshell.dll netshell.spec) list(APPEND SOURCE @@ -19,12 +19,8 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/netshell.def) add_library(netshell SHARED ${SOURCE}) - set_module_type(netshell win32dll) - -target_link_libraries(netshell - uuid - wine) +target_link_libraries(netshell uuid wine) add_importlibs(netshell msvcrt @@ -42,5 +38,4 @@ add_importlibs(netshell ntdll) add_pch(netshell precomp.h) - add_cd_file(TARGET netshell DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/ntprint/CMakeLists.txt b/reactos/dll/win32/ntprint/CMakeLists.txt index ff7d1681211..29196d54496 100644 --- a/reactos/dll/win32/ntprint/CMakeLists.txt +++ b/reactos/dll/win32/ntprint/CMakeLists.txt @@ -1,7 +1,5 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) - -set_rc_compiler() spec2def(ntprint.dll ntprint.spec) list(APPEND SOURCE @@ -11,11 +9,8 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/ntprint.def) add_library(ntprint SHARED ${SOURCE}) - set_module_type(ntprint win32dll) - target_link_libraries(ntprint wine) - add_importlibs(ntprint winspool msvcrt kernel32 ntdll) add_dependencies(ntprint psdk) add_cd_file(TARGET ntprint DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/oleacc/CMakeLists.txt b/reactos/dll/win32/oleacc/CMakeLists.txt index 7551b38c343..6f46767afa7 100644 --- a/reactos/dll/win32/oleacc/CMakeLists.txt +++ b/reactos/dll/win32/oleacc/CMakeLists.txt @@ -1,8 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - -set_rc_compiler() spec2def(oleacc.dll oleacc.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -12,12 +10,7 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/oleacc.def) add_library(oleacc SHARED ${SOURCE}) - set_module_type(oleacc win32dll) - target_link_libraries(oleacc wine) - add_importlibs(oleacc user32 msvcrt kernel32 ntdll) - - add_cd_file(TARGET oleacc DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/olecli32/CMakeLists.txt b/reactos/dll/win32/olecli32/CMakeLists.txt index 468a80accb4..1d8debfe937 100644 --- a/reactos/dll/win32/olecli32/CMakeLists.txt +++ b/reactos/dll/win32/olecli32/CMakeLists.txt @@ -1,8 +1,6 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) - -set_rc_compiler() spec2def(olecli32.dll olecli32.spec) list(APPEND SOURCE @@ -12,9 +10,7 @@ list(APPEND SOURCE add_library(olecli32 SHARED ${SOURCE}) set_module_type(olecli32 win32dll ENTRYPOINT 0 ) - target_link_libraries(olecli32 wine) - add_importlibs(olecli32 ole32 gdi32 kernel32 ntdll) add_dependencies(olecli32 psdk) add_cd_file(TARGET olecli32 DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/olethk32/CMakeLists.txt b/reactos/dll/win32/olethk32/CMakeLists.txt index 1fa6589c538..2056f4919c1 100644 --- a/reactos/dll/win32/olethk32/CMakeLists.txt +++ b/reactos/dll/win32/olethk32/CMakeLists.txt @@ -1,8 +1,6 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) - -set_rc_compiler() spec2def(olethk32.dll olethk32.spec) list(APPEND SOURCE @@ -12,11 +10,8 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/olethk32.def) add_library(olethk32 SHARED ${SOURCE}) - set_module_type(olethk32 win32dll) - target_link_libraries(olethk32 wine) - add_importlibs(olethk32 msvcrt kernel32 ntdll) add_dependencies(olethk32 psdk) add_cd_file(TARGET olethk32 DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/pidgen/CMakeLists.txt b/reactos/dll/win32/pidgen/CMakeLists.txt index e175a586c1a..88096edf719 100644 --- a/reactos/dll/win32/pidgen/CMakeLists.txt +++ b/reactos/dll/win32/pidgen/CMakeLists.txt @@ -1,8 +1,6 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) - -set_rc_compiler() spec2def(pidgen.dll pidgen.spec) list(APPEND SOURCE @@ -12,11 +10,7 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/pidgen.def) add_library(pidgen SHARED ${SOURCE}) - set_module_type(pidgen win32dll) - target_link_libraries(pidgen wine) - add_importlibs(pidgen msvcrt kernel32 ntdll) - add_cd_file(TARGET pidgen DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/pstorec/CMakeLists.txt b/reactos/dll/win32/pstorec/CMakeLists.txt index 78ac1328bfb..4ec8a8a881a 100644 --- a/reactos/dll/win32/pstorec/CMakeLists.txt +++ b/reactos/dll/win32/pstorec/CMakeLists.txt @@ -1,9 +1,6 @@ add_typelib(pstorec_tlb.idl) - add_definitions(-D__WINESRC__) - -set_rc_compiler() spec2def(pstorec.dll pstorec.spec) list(APPEND SOURCE @@ -13,9 +10,7 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/pstorec.def) set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/pstorec_tlb.tlb) - add_library(pstorec SHARED ${SOURCE}) - set_module_type(pstorec win32dll) target_link_libraries(pstorec uuid wine) add_importlibs(pstorec msvcrt kernel32 ntdll) diff --git a/reactos/dll/win32/qmgr/CMakeLists.txt b/reactos/dll/win32/qmgr/CMakeLists.txt index b8d2d508d53..ac782d8e2ea 100644 --- a/reactos/dll/win32/qmgr/CMakeLists.txt +++ b/reactos/dll/win32/qmgr/CMakeLists.txt @@ -1,11 +1,7 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - -set_rc_compiler() - generate_idl_iids(qmgr_local.idl) - spec2def(qmgr.dll qmgr.spec) list(APPEND SOURCE @@ -22,9 +18,7 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/qmgr.def) add_library(qmgr SHARED ${SOURCE}) - add_idl_headers(qmgr_idlheader qmgr_local.idl) - set_module_type(qmgr win32dll) target_link_libraries(qmgr uuid wine) add_importlibs(qmgr ole32 wininet urlmon advapi32 msvcrt kernel32 ntdll) diff --git a/reactos/dll/win32/rasapi32/CMakeLists.txt b/reactos/dll/win32/rasapi32/CMakeLists.txt index 6919610918a..7da5e10b675 100644 --- a/reactos/dll/win32/rasapi32/CMakeLists.txt +++ b/reactos/dll/win32/rasapi32/CMakeLists.txt @@ -2,7 +2,6 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) -set_rc_compiler() spec2def(rasapi32.dll rasapi32.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -12,10 +11,7 @@ list(APPEND SOURCE add_library(rasapi32 SHARED ${SOURCE}) set_module_type(rasapi32 win32dll ENTRYPOINT 0 ) - target_link_libraries(rasapi32 wine) - add_importlibs(rasapi32 kernel32 ntdll) - add_dependencies(rasapi32 psdk) add_cd_file(TARGET rasapi32 DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/rasdlg/CMakeLists.txt b/reactos/dll/win32/rasdlg/CMakeLists.txt index 0079620d800..3b0cb2a4a5e 100644 --- a/reactos/dll/win32/rasdlg/CMakeLists.txt +++ b/reactos/dll/win32/rasdlg/CMakeLists.txt @@ -1,5 +1,4 @@ -set_rc_compiler() spec2def(rasdlg.dll rasdlg.spec) list(APPEND SOURCE @@ -9,13 +8,7 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/rasdlg.def) add_library(rasdlg SHARED ${SOURCE}) - set_module_type(rasdlg win32dll) - -target_link_libraries(rasdlg - wine - uuid) - +target_link_libraries(rasdlg wine uuid) add_importlibs(rasdlg msvcrt kernel32 ntdll) - add_cd_file(TARGET rasdlg DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/rasman/CMakeLists.txt b/reactos/dll/win32/rasman/CMakeLists.txt index 626f7563172..ef32f9b54dd 100644 --- a/reactos/dll/win32/rasman/CMakeLists.txt +++ b/reactos/dll/win32/rasman/CMakeLists.txt @@ -1,4 +1,4 @@ -set_rc_compiler() + spec2def(rasman.dll rasman.spec) list(APPEND SOURCE @@ -8,13 +8,7 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/rasman.def) add_library(rasman SHARED ${SOURCE}) - set_module_type(rasman win32dll) - -target_link_libraries(rasman - wine - uuid) - +target_link_libraries(rasman wine uuid) add_importlibs(rasman msvcrt kernel32 ntdll) - add_cd_file(TARGET rasman DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/samlib/CMakeLists.txt b/reactos/dll/win32/samlib/CMakeLists.txt index 9af1c0cf606..ea6c9c02845 100644 --- a/reactos/dll/win32/samlib/CMakeLists.txt +++ b/reactos/dll/win32/samlib/CMakeLists.txt @@ -4,12 +4,8 @@ include_directories( ${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) - -set_rc_compiler() spec2def(samlib.dll samlib.spec ADD_IMPORTLIB) - -add_rpc_files(client - ${REACTOS_SOURCE_DIR}/include/reactos/idl/sam.idl) +add_rpc_files(client ${REACTOS_SOURCE_DIR}/include/reactos/idl/sam.idl) list(APPEND SOURCE dllmain.c @@ -25,4 +21,3 @@ target_link_libraries(samlib wine ${PSEH_LIB}) add_importlibs(samlib rpcrt4 advapi32 msvcrt kernel32 ntdll) add_pch(samlib precomp.h) add_cd_file(TARGET samlib DESTINATION reactos/system32 FOR all) - diff --git a/reactos/dll/win32/schannel/CMakeLists.txt b/reactos/dll/win32/schannel/CMakeLists.txt index de83c952b78..e7917004cb5 100644 --- a/reactos/dll/win32/schannel/CMakeLists.txt +++ b/reactos/dll/win32/schannel/CMakeLists.txt @@ -1,7 +1,6 @@ + include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) - -set_rc_compiler() spec2def(schannel.dll schannel.spec) list(APPEND SOURCE @@ -13,11 +12,7 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/schannel.def) add_library(schannel SHARED ${SOURCE}) - set_module_type(schannel win32dll) - target_link_libraries(schannel wine) - add_importlibs(schannel secur32 msvcrt kernel32 ntdll) - add_cd_file(TARGET schannel DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/security/CMakeLists.txt b/reactos/dll/win32/security/CMakeLists.txt index 372a44d22b2..8b95de00585 100644 --- a/reactos/dll/win32/security/CMakeLists.txt +++ b/reactos/dll/win32/security/CMakeLists.txt @@ -1,6 +1,5 @@ -add_definitions(-D__SECURITY__) -set_rc_compiler() +add_definitions(-D__SECURITY__) spec2def(security.dll security.spec) list(APPEND SOURCE @@ -8,9 +7,6 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/security.def) add_library(security SHARED ${SOURCE}) - set_module_type(security win32dll ENTRYPOINT 0 UNICODE) - add_importlibs(security secur32 advapi32 ntdll kernel32) - add_cd_file(TARGET security DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/serialui/CMakeLists.txt b/reactos/dll/win32/serialui/CMakeLists.txt index 76f4753c680..728ff9a6bd8 100644 --- a/reactos/dll/win32/serialui/CMakeLists.txt +++ b/reactos/dll/win32/serialui/CMakeLists.txt @@ -1,5 +1,4 @@ -set_rc_compiler() spec2def(serialui.dll serialui.spec) list(APPEND SOURCE @@ -8,7 +7,6 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/serialui.def) add_library(serialui SHARED ${SOURCE}) - set_module_type(serialui win32dll UNICODE) add_importlibs(serialui user32 shlwapi msvcrt kernel32) add_cd_file(TARGET serialui DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/setupapi/CMakeLists.txt b/reactos/dll/win32/setupapi/CMakeLists.txt index 892a4ac1f64..1ca7dd12fc0 100644 --- a/reactos/dll/win32/setupapi/CMakeLists.txt +++ b/reactos/dll/win32/setupapi/CMakeLists.txt @@ -10,9 +10,6 @@ add_definitions( -Dwcsnicmp=_wcsnicmp) add_rpc_files(client ${REACTOS_SOURCE_DIR}/include/reactos/idl/pnp.idl) - -set_rc_compiler() - spec2def(setupapi.dll setupapi.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -55,4 +52,3 @@ add_importlibs(setupapi add_pch(setupapi setupapi_private.h) add_cd_file(TARGET setupapi DESTINATION reactos/system32 FOR all) - diff --git a/reactos/dll/win32/shdoclc/CMakeLists.txt b/reactos/dll/win32/shdoclc/CMakeLists.txt index 843c88a3916..dac1368796c 100644 --- a/reactos/dll/win32/shdoclc/CMakeLists.txt +++ b/reactos/dll/win32/shdoclc/CMakeLists.txt @@ -1,17 +1,13 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - -set_rc_compiler() spec2def(shdoclc.dll shdoclc.spec) -add_library(shdoclc SHARED rsrc.rc +add_library(shdoclc SHARED + rsrc.rc ${CMAKE_CURRENT_BINARY_DIR}/shdoclc.def) set_module_type(shdoclc win32dll ENTRYPOINT 0 ) - target_link_libraries(shdoclc wine) - add_importlibs(shdoclc kernel32 ntdll) add_dependencies(shdoclc psdk) - -add_cd_file(TARGET shdoclc DESTINATION reactos/system32 FOR all) \ No newline at end of file +add_cd_file(TARGET shdoclc DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/shimgvw/CMakeLists.txt b/reactos/dll/win32/shimgvw/CMakeLists.txt index 1514361c732..6d3249cc37e 100644 --- a/reactos/dll/win32/shimgvw/CMakeLists.txt +++ b/reactos/dll/win32/shimgvw/CMakeLists.txt @@ -1,5 +1,4 @@ -set_rc_compiler() spec2def(shimgvw.dll shimgvw.spec) list(APPEND SOURCE @@ -9,9 +8,7 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/shimgvw.def) add_library(shimgvw SHARED ${SOURCE}) - set_module_type(shimgvw win32dll) - target_link_libraries(shimgvw wine) add_importlibs(shimgvw diff --git a/reactos/dll/win32/snmpapi/CMakeLists.txt b/reactos/dll/win32/snmpapi/CMakeLists.txt index 07278926b75..6a5f18f9497 100644 --- a/reactos/dll/win32/snmpapi/CMakeLists.txt +++ b/reactos/dll/win32/snmpapi/CMakeLists.txt @@ -1,11 +1,9 @@ -add_definitions(-D__WINESRC__) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) -set_rc_compiler() +add_definitions(-D__WINESRC__) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(snmpapi.dll snmpapi.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -15,12 +13,7 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/snmpapi.def) add_library(snmpapi SHARED ${SOURCE}) - set_module_type(snmpapi win32dll) - target_link_libraries(snmpapi wine) - add_importlibs(snmpapi msvcrt kernel32 ntdll) - add_cd_file(TARGET snmpapi DESTINATION reactos/system32 FOR all) - diff --git a/reactos/dll/win32/stdole2.tlb/CMakeLists.txt b/reactos/dll/win32/stdole2.tlb/CMakeLists.txt index 2abd2ebe981..ce7f9c2d314 100644 --- a/reactos/dll/win32/stdole2.tlb/CMakeLists.txt +++ b/reactos/dll/win32/stdole2.tlb/CMakeLists.txt @@ -1,21 +1,15 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - add_typelib(std_ole_v2.idl) - -set_rc_compiler() spec2def(stdole2.tlb stdole2.tlb.spec) list(APPEND SOURCE rsrc.rc ${CMAKE_CURRENT_BINARY_DIR}/stdole2.def) - + set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/std_ole_v2.tlb) - add_library(stdole2.tlb SHARED ${SOURCE}) - set_module_type(stdole2.tlb module) set_target_properties(stdole2.tlb PROPERTIES SUFFIX "") - add_cd_file(TARGET stdole2.tlb DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/syssetup/CMakeLists.txt b/reactos/dll/win32/syssetup/CMakeLists.txt index 81e7e6ab400..419edde3cf3 100644 --- a/reactos/dll/win32/syssetup/CMakeLists.txt +++ b/reactos/dll/win32/syssetup/CMakeLists.txt @@ -1,6 +1,4 @@ -set_rc_compiler() - spec2def(syssetup.dll syssetup.spec) list(APPEND SOURCE diff --git a/reactos/dll/win32/tapiui/CMakeLists.txt b/reactos/dll/win32/tapiui/CMakeLists.txt index b75dd8de35f..dc5fe431f56 100644 --- a/reactos/dll/win32/tapiui/CMakeLists.txt +++ b/reactos/dll/win32/tapiui/CMakeLists.txt @@ -1,6 +1,4 @@ -set_rc_compiler() - add_library(tapiui SHARED tapiui.rc) set_module_type(tapiui win32dll ENTRYPOINT 0 ) add_dependencies(tapiui psdk) diff --git a/reactos/dll/win32/userenv/CMakeLists.txt b/reactos/dll/win32/userenv/CMakeLists.txt index 7d7cd170cef..dbf2c9a2aa2 100644 --- a/reactos/dll/win32/userenv/CMakeLists.txt +++ b/reactos/dll/win32/userenv/CMakeLists.txt @@ -1,8 +1,6 @@ spec2def(userenv.dll userenv.spec ADD_IMPORTLIB) -set_rc_compiler() - list(APPEND SOURCE desktop.c directory.c @@ -18,13 +16,8 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/userenv.def) add_library(userenv SHARED ${SOURCE}) - set_module_type(userenv win32dll) - target_link_libraries(userenv uuid) - add_importlibs(userenv advapi32 user32 msvcrt kernel32 ntdll) add_pch(userenv precomp.h) - add_cd_file(TARGET userenv DESTINATION reactos/system32 FOR all) - diff --git a/reactos/dll/win32/uxtheme/CMakeLists.txt b/reactos/dll/win32/uxtheme/CMakeLists.txt index 818ceed3ad8..176431ba0fb 100644 --- a/reactos/dll/win32/uxtheme/CMakeLists.txt +++ b/reactos/dll/win32/uxtheme/CMakeLists.txt @@ -1,8 +1,6 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) -set_rc_compiler() - spec2def(uxtheme.dll uxtheme.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -29,4 +27,3 @@ add_delay_importlibs(uxtheme msimg32) add_importlibs(uxtheme user32 advapi32 gdi32 msvcrt kernel32 ntdll) add_pch(uxtheme uxthemep.h) add_cd_file(TARGET uxtheme DESTINATION reactos/system32 FOR all) - diff --git a/reactos/dll/win32/winspool/CMakeLists.txt b/reactos/dll/win32/winspool/CMakeLists.txt index ccde1a6454b..2f7d2ac0873 100644 --- a/reactos/dll/win32/winspool/CMakeLists.txt +++ b/reactos/dll/win32/winspool/CMakeLists.txt @@ -1,9 +1,5 @@ - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - -set_rc_compiler() - spec2def(winspool.drv winspool.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -14,11 +10,8 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/winspool.def) add_library(winspool.drv SHARED ${SOURCE}) - set_target_properties(winspool.drv PROPERTIES SUFFIX "") - set_module_type(winspool.drv win32dll UNICODE) target_link_libraries(winspool.drv wine) add_importlibs(winspool.drv advapi32 shlwapi msvcrt kernel32 ntdll) add_cd_file(TARGET winspool.drv DESTINATION reactos/system32 FOR all) - diff --git a/reactos/dll/win32/wldap32/CMakeLists.txt b/reactos/dll/win32/wldap32/CMakeLists.txt index fe41ad675d3..e80f532d1ef 100644 --- a/reactos/dll/win32/wldap32/CMakeLists.txt +++ b/reactos/dll/win32/wldap32/CMakeLists.txt @@ -1,8 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - -set_rc_compiler() spec2def(wldap32.dll wldap32.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -31,11 +29,7 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/wldap32.def) add_library(wldap32 SHARED ${SOURCE}) - set_module_type(wldap32 win32dll) - target_link_libraries(wldap32 wine) - add_importlibs(wldap32 user32 msvcrt kernel32 ntdll) - add_cd_file(TARGET wldap32 DESTINATION reactos/system32 FOR all) diff --git a/reactos/drivers/input/i8042prt/CMakeLists.txt b/reactos/drivers/input/i8042prt/CMakeLists.txt index ecf91a144f9..86557ff3042 100644 --- a/reactos/drivers/input/i8042prt/CMakeLists.txt +++ b/reactos/drivers/input/i8042prt/CMakeLists.txt @@ -1,6 +1,4 @@ -set_rc_compiler() - add_library(i8042prt SHARED createclose.c i8042prt.c @@ -16,4 +14,4 @@ add_library(i8042prt SHARED set_module_type(i8042prt kernelmodedriver) add_importlibs(i8042prt ntoskrnl hal) add_pch(i8042prt i8042prt.h) -add_cd_file(TARGET i8042prt DESTINATION reactos/system32/drivers NO_CAB FOR all) \ No newline at end of file +add_cd_file(TARGET i8042prt DESTINATION reactos/system32/drivers NO_CAB FOR all) diff --git a/reactos/drivers/storage/ide/uniata/CMakeLists.txt b/reactos/drivers/storage/ide/uniata/CMakeLists.txt index 47a82982ba2..00128c2f8d8 100644 --- a/reactos/drivers/storage/ide/uniata/CMakeLists.txt +++ b/reactos/drivers/storage/ide/uniata/CMakeLists.txt @@ -6,7 +6,6 @@ include_directories( #add_definitions(-D_DEBUG) set_cpp() -set_rc_compiler() list(APPEND SOURCE id_ata.cpp @@ -18,9 +17,7 @@ list(APPEND SOURCE id_sata.cpp ros_glue/ros_glue.cpp) -add_library(uniata SHARED - ${SOURCE} - idedma.rc) +add_library(uniata SHARED ${SOURCE} idedma.rc) # FIXME: http://www.cmake.org/Bug/view.php?id=12998 if(MSVC) diff --git a/reactos/drivers/storage/port/buslogic/CMakeLists.txt b/reactos/drivers/storage/port/buslogic/CMakeLists.txt index 79917511364..300fcd023c6 100644 --- a/reactos/drivers/storage/port/buslogic/CMakeLists.txt +++ b/reactos/drivers/storage/port/buslogic/CMakeLists.txt @@ -1,11 +1,6 @@ -set_rc_compiler() - add_library(buslogic SHARED BusLogic958.c BusLogic958.rc) - target_link_libraries(buslogic libcntpr) - set_module_type(buslogic kernelmodedriver) add_importlibs(buslogic scsiport) - add_cd_file(TARGET buslogic DESTINATION reactos/system32/drivers NO_CAB FOR all) diff --git a/reactos/ntoskrnl/CMakeLists.txt b/reactos/ntoskrnl/CMakeLists.txt index f888066d03d..02605d87e1c 100644 --- a/reactos/ntoskrnl/CMakeLists.txt +++ b/reactos/ntoskrnl/CMakeLists.txt @@ -18,11 +18,9 @@ add_definitions( -D_IN_KERNEL_ -DNTDDI_VERSION=0x05020400) -set_rc_compiler() - if(NOT DEFINED NEWCC) set(NEWCC FALSE) -endif(NOT DEFINED NEWCC) +endif() if(NEWCC) add_definitions(-DNEWCC) @@ -428,9 +426,9 @@ add_executable(ntoskrnl ${CMAKE_CURRENT_BINARY_DIR}/ntoskrnl.def) if(ARCH STREQUAL "i386") - set_entrypoint(ntoskrnl KiSystemStartup 4) + set_entrypoint(ntoskrnl KiSystemStartup 4) else() - set_entrypoint(ntoskrnl KiSystemStartup) + set_entrypoint(ntoskrnl KiSystemStartup) endif() set_subsystem(ntoskrnl native) @@ -457,10 +455,8 @@ target_link_libraries(ntoskrnl ioevent) add_importlibs(ntoskrnl hal kdcom bootvid) - add_pch(ntoskrnl include/ntoskrnl.h) add_dependencies(ntoskrnl psdk bugcodes asm) - add_cd_file(TARGET ntoskrnl DESTINATION reactos/system32 NO_CAB FOR all) if(BUILD_MP) diff --git a/reactos/subsystems/ntvdm/CMakeLists.txt b/reactos/subsystems/ntvdm/CMakeLists.txt index 2346970488e..7a1c6aa155d 100644 --- a/reactos/subsystems/ntvdm/CMakeLists.txt +++ b/reactos/subsystems/ntvdm/CMakeLists.txt @@ -1,15 +1,11 @@ include_directories(.) -set_rc_compiler() - add_executable(ntvdm ntvdm.c ntvdm.rc) set_module_type(ntvdm win32cui) - add_importlibs(ntvdm ntdll user32 gdi32 advapi32 msvcrt kernel32) add_dependencies(ntvdm ndk bugcodes) - add_cd_file(TARGET ntvdm DESTINATION reactos/system32 FOR all) diff --git a/reactos/win32ss/user/user32/CMakeLists.txt b/reactos/win32ss/user/user32/CMakeLists.txt index d7bfe869d73..537682f209e 100644 --- a/reactos/win32ss/user/user32/CMakeLists.txt +++ b/reactos/win32ss/user/user32/CMakeLists.txt @@ -7,8 +7,6 @@ include_directories( include ${REACTOS_SOURCE_DIR}/win32ss/include) -set_rc_compiler() - list(APPEND SOURCE controls/appswitch.c controls/button.c @@ -71,16 +69,8 @@ else() endif() add_library(user32 SHARED ${SOURCE}) -set_module_type(user32 - win32dll - ENTRYPOINT DllMain 12 - UNICODE) - -target_link_libraries(user32 - user32_wsprintf - wine - win32ksys - ${PSEH_LIB}) +set_module_type(user32 win32dll ENTRYPOINT DllMain 12 UNICODE) +target_link_libraries(user32 user32_wsprintf wine win32ksys ${PSEH_LIB}) if(MSVC) # for __ftol2_sse, float to int cast helper @@ -91,4 +81,3 @@ add_delay_importlibs(user32 imm32 usp10) add_importlibs(user32 gdi32 advapi32 kernel32 ntdll) add_pch(user32 include/user32.h) add_cd_file(TARGET user32 DESTINATION reactos/system32 FOR all) - diff --git a/reactos/win32ss/user/win32csr/CMakeLists.txt b/reactos/win32ss/user/win32csr/CMakeLists.txt index f07f8dd8d7e..481cd4073a5 100644 --- a/reactos/win32ss/user/win32csr/CMakeLists.txt +++ b/reactos/win32ss/user/win32csr/CMakeLists.txt @@ -9,8 +9,6 @@ include_directories( spec2def(win32csr.dll win32csr.spec) -set_rc_compiler() - list(APPEND SOURCE alias.c coninput.c @@ -29,17 +27,10 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/win32csr.def) add_library(win32csr SHARED ${SOURCE}) - -target_link_libraries(win32csr - win32ksys - ${PSEH_LIB}) - +target_link_libraries(win32csr win32ksys ${PSEH_LIB}) set_module_type(win32csr win32dll) - add_importlibs(win32csr psapi msvcrt kernel32 ntdll csrsrv) add_delay_importlibs(win32csr user32 gdi32 advapi32) - add_pch(win32csr w32csr.h) - add_dependencies(win32csr bugcodes) add_cd_file(TARGET win32csr DESTINATION reactos/system32 FOR all)