From 2bdcf8789d3e537638ad61dd6137c565a92f7249 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Fri, 17 Oct 2014 23:28:29 +0000 Subject: [PATCH] [CMAKE] * Make the minimum required version 2.8. * Remove redundant psdk dependencies. * Tidy up CMake files. svn path=/trunk/; revision=64795 --- reactos/CMakeLists.txt | 2 +- .../base/applications/atactl/CMakeLists.txt | 2 - .../applications/cmdutils/help/CMakeLists.txt | 8 +- .../cmdutils/hostname/CMakeLists.txt | 1 - .../cmdutils/lodctr/CMakeLists.txt | 2 - .../applications/cmdutils/mode/CMakeLists.txt | 1 - .../applications/cmdutils/more/CMakeLists.txt | 1 - .../games/solitaire/CMakeLists.txt | 1 - .../base/applications/kbswitch/CMakeLists.txt | 1 + .../kbswitch/kbsdll/CMakeLists.txt | 2 - .../mscutils/eventvwr/CMakeLists.txt | 2 + .../applications/network/arp/CMakeLists.txt | 3 - .../applications/network/dwnl/CMakeLists.txt | 5 +- .../applications/network/netsh/CMakeLists.txt | 2 - .../applications/network/ping/CMakeLists.txt | 2 + .../applications/network/route/CMakeLists.txt | 2 - .../network/tracert/CMakeLists.txt | 6 +- .../applications/network/whois/CMakeLists.txt | 1 - .../network/wlanconf/CMakeLists.txt | 2 +- .../base/applications/setup16/CMakeLists.txt | 2 +- .../base/applications/shutdown/CMakeLists.txt | 2 +- .../base/applications/sndrec32/CMakeLists.txt | 2 +- .../base/applications/wordpad/CMakeLists.txt | 2 - reactos/base/services/rpcss/CMakeLists.txt | 8 +- reactos/base/services/spoolsv/CMakeLists.txt | 3 - reactos/base/services/telnetd/CMakeLists.txt | 1 - reactos/base/services/thmsvc/CMakeLists.txt | 2 - reactos/base/services/umpnpmgr/CMakeLists.txt | 7 +- reactos/base/services/wlansvc/CMakeLists.txt | 1 - reactos/base/setup/setup/CMakeLists.txt | 2 - reactos/base/setup/usetup/CMakeLists.txt | 1 + .../base/shell/explorer-new/CMakeLists.txt | 16 +--- reactos/base/shell/explorer/CMakeLists.txt | 1 - reactos/base/system/autochk/CMakeLists.txt | 2 - reactos/base/system/bootok/CMakeLists.txt | 2 - reactos/base/system/diskpart/CMakeLists.txt | 6 +- reactos/base/system/expand/CMakeLists.txt | 2 - reactos/base/system/format/CMakeLists.txt | 1 - reactos/base/system/lsass/CMakeLists.txt | 3 - reactos/base/system/msiexec/CMakeLists.txt | 2 - reactos/base/system/rundll32/CMakeLists.txt | 1 + reactos/base/system/services/CMakeLists.txt | 1 - reactos/boot/bootdata/packages/CMakeLists.txt | 4 +- reactos/boot/freeldr/bootsect/CMakeLists.txt | 25 +++-- reactos/boot/freeldr/freeldr/CMakeLists.txt | 7 +- reactos/boot/freeldr/install/CMakeLists.txt | 1 - reactos/dll/3rdparty/dxtn/CMakeLists.txt | 4 - reactos/dll/3rdparty/libjpeg/CMakeLists.txt | 1 - reactos/dll/3rdparty/libtiff/CMakeLists.txt | 1 - reactos/dll/3rdparty/libxslt/CMakeLists.txt | 2 +- reactos/dll/cpl/appwiz/CMakeLists.txt | 4 +- reactos/dll/cpl/console/CMakeLists.txt | 10 +- reactos/dll/cpl/desk/CMakeLists.txt | 17 +--- reactos/dll/cpl/hdwwiz/CMakeLists.txt | 21 ++--- reactos/dll/cpl/hotplug/CMakeLists.txt | 20 +--- reactos/dll/cpl/input/CMakeLists.txt | 10 +- reactos/dll/cpl/intl/CMakeLists.txt | 12 +-- reactos/dll/cpl/joy/CMakeLists.txt | 18 ++-- reactos/dll/cpl/main/CMakeLists.txt | 13 +-- reactos/dll/cpl/mmsys/CMakeLists.txt | 17 +--- reactos/dll/cpl/ncpa/CMakeLists.txt | 13 +-- reactos/dll/cpl/odbccp32/CMakeLists.txt | 2 - reactos/dll/cpl/powercfg/CMakeLists.txt | 12 +-- reactos/dll/cpl/sysdm/CMakeLists.txt | 17 +--- reactos/dll/cpl/telephon/CMakeLists.txt | 18 ++-- reactos/dll/cpl/timedate/CMakeLists.txt | 12 +-- reactos/dll/cpl/usrmgr/CMakeLists.txt | 13 +-- reactos/dll/cpl/wined3dcfg/CMakeLists.txt | 9 +- reactos/dll/directx/d3d8thk/CMakeLists.txt | 6 +- reactos/dll/directx/ddraw/CMakeLists.txt | 93 ++++++++----------- reactos/dll/directx/ksproxy/CMakeLists.txt | 2 - reactos/dll/directx/ksuser/CMakeLists.txt | 9 +- reactos/dll/directx/wine/d3d8/CMakeLists.txt | 1 - reactos/dll/directx/wine/d3d9/CMakeLists.txt | 1 - .../wine/d3dcompiler_43/CMakeLists.txt | 1 - .../dll/directx/wine/d3dx9_24/CMakeLists.txt | 1 - .../dll/directx/wine/d3dx9_25/CMakeLists.txt | 1 - .../dll/directx/wine/d3dx9_26/CMakeLists.txt | 1 - .../dll/directx/wine/d3dx9_27/CMakeLists.txt | 1 - .../dll/directx/wine/d3dx9_28/CMakeLists.txt | 1 - .../dll/directx/wine/d3dx9_29/CMakeLists.txt | 1 - .../dll/directx/wine/d3dx9_30/CMakeLists.txt | 1 - .../dll/directx/wine/d3dx9_31/CMakeLists.txt | 1 - .../dll/directx/wine/d3dx9_32/CMakeLists.txt | 1 - .../dll/directx/wine/d3dx9_33/CMakeLists.txt | 1 - .../dll/directx/wine/d3dx9_34/CMakeLists.txt | 1 - .../dll/directx/wine/d3dx9_35/CMakeLists.txt | 1 - .../dll/directx/wine/d3dx9_36/CMakeLists.txt | 1 - .../dll/directx/wine/d3dx9_37/CMakeLists.txt | 1 - .../dll/directx/wine/d3dx9_38/CMakeLists.txt | 1 - .../dll/directx/wine/d3dx9_39/CMakeLists.txt | 1 - .../dll/directx/wine/d3dx9_40/CMakeLists.txt | 1 - .../dll/directx/wine/d3dx9_41/CMakeLists.txt | 1 - .../dll/directx/wine/d3dx9_42/CMakeLists.txt | 1 - .../dll/directx/wine/d3dx9_43/CMakeLists.txt | 1 - .../dll/directx/wine/d3dxof/CMakeLists.txt | 1 - .../dll/directx/wine/dplayx/CMakeLists.txt | 1 - .../dll/directx/wine/dsound/CMakeLists.txt | 1 - reactos/dll/directx/wine/dxgi/CMakeLists.txt | 1 - .../dll/directx/wine/quartz/CMakeLists.txt | 2 - reactos/dll/nls/idndl/CMakeLists.txt | 2 - reactos/dll/nls/normaliz/CMakeLists.txt | 4 - reactos/dll/ntdll/CMakeLists.txt | 10 +- reactos/dll/opengl/mesa/CMakeLists.txt | 3 +- .../opengl/mesa/drivers/common/CMakeLists.txt | 5 +- reactos/dll/opengl/mesa/main/CMakeLists.txt | 1 + reactos/dll/opengl/mesa/swrast/CMakeLists.txt | 4 +- .../opengl/mesa/swrast_setup/CMakeLists.txt | 5 +- reactos/dll/opengl/mesa/x86/CMakeLists.txt | 6 +- reactos/dll/shellext/deskadp/CMakeLists.txt | 11 +-- reactos/dll/shellext/deskmon/CMakeLists.txt | 11 +-- reactos/dll/shellext/devcpux/CMakeLists.txt | 10 +- reactos/dll/shellext/fontext/CMakeLists.txt | 14 +-- reactos/dll/shellext/slayer/CMakeLists.txt | 12 +-- reactos/dll/win32/aclui/CMakeLists.txt | 1 - reactos/dll/win32/actxprxy/CMakeLists.txt | 2 - reactos/dll/win32/advapi32/CMakeLists.txt | 4 - reactos/dll/win32/advpack/CMakeLists.txt | 2 - reactos/dll/win32/atl/CMakeLists.txt | 2 - reactos/dll/win32/atl100/CMakeLists.txt | 1 - reactos/dll/win32/authz/CMakeLists.txt | 3 - reactos/dll/win32/avicap32/CMakeLists.txt | 5 - reactos/dll/win32/beepmidi/CMakeLists.txt | 4 - reactos/dll/win32/browseui/CMakeLists.txt | 22 +---- reactos/dll/win32/cfgmgr32/CMakeLists.txt | 3 +- reactos/dll/win32/comcat/CMakeLists.txt | 1 - reactos/dll/win32/compstui/CMakeLists.txt | 6 -- reactos/dll/win32/credui/CMakeLists.txt | 1 - reactos/dll/win32/crtdll/CMakeLists.txt | 3 - reactos/dll/win32/cryptdlg/CMakeLists.txt | 1 - reactos/dll/win32/cryptdll/CMakeLists.txt | 1 - reactos/dll/win32/cryptnet/CMakeLists.txt | 1 - reactos/dll/win32/cryptui/CMakeLists.txt | 1 - reactos/dll/win32/devmgr/CMakeLists.txt | 12 +-- reactos/dll/win32/dhcpcsvc/CMakeLists.txt | 2 - reactos/dll/win32/dnsapi/CMakeLists.txt | 3 - reactos/dll/win32/dwmapi/CMakeLists.txt | 1 - reactos/dll/win32/fmifs/CMakeLists.txt | 1 - reactos/dll/win32/framedyn/CMakeLists.txt | 2 - reactos/dll/win32/fusion/CMakeLists.txt | 1 - reactos/dll/win32/gdiplus/CMakeLists.txt | 1 - reactos/dll/win32/getuname/CMakeLists.txt | 3 - reactos/dll/win32/hhctrl.ocx/CMakeLists.txt | 6 +- reactos/dll/win32/hid/CMakeLists.txt | 2 - reactos/dll/win32/hlink/CMakeLists.txt | 1 - reactos/dll/win32/ieframe/CMakeLists.txt | 4 - reactos/dll/win32/imaadp32.acm/CMakeLists.txt | 1 - reactos/dll/win32/imagehlp/CMakeLists.txt | 1 - reactos/dll/win32/inetmib1/CMakeLists.txt | 1 - reactos/dll/win32/initpki/CMakeLists.txt | 1 - reactos/dll/win32/iologmsg/CMakeLists.txt | 1 + reactos/dll/win32/iphlpapi/CMakeLists.txt | 2 - reactos/dll/win32/itircl/CMakeLists.txt | 1 - reactos/dll/win32/itss/CMakeLists.txt | 1 - reactos/dll/win32/jscript/CMakeLists.txt | 2 +- reactos/dll/win32/jsproxy/CMakeLists.txt | 1 - .../dll/win32/kernel32_vista/CMakeLists.txt | 3 +- reactos/dll/win32/lpk/CMakeLists.txt | 4 - reactos/dll/win32/lsasrv/CMakeLists.txt | 1 - reactos/dll/win32/lz32/CMakeLists.txt | 4 - reactos/dll/win32/mciavi32/CMakeLists.txt | 1 - reactos/dll/win32/mcicda/CMakeLists.txt | 5 +- reactos/dll/win32/mciqtz32/CMakeLists.txt | 1 - reactos/dll/win32/mciseq/CMakeLists.txt | 1 - reactos/dll/win32/mciwave/CMakeLists.txt | 4 - reactos/dll/win32/mgmtapi/CMakeLists.txt | 1 - reactos/dll/win32/mmdrv/CMakeLists.txt | 6 +- reactos/dll/win32/mprapi/CMakeLists.txt | 2 - reactos/dll/win32/msadp32.acm/CMakeLists.txt | 1 - reactos/dll/win32/msafd/CMakeLists.txt | 2 - reactos/dll/win32/mscms/CMakeLists.txt | 1 - reactos/dll/win32/mscoree/CMakeLists.txt | 5 +- reactos/dll/win32/mshtml.tlb/CMakeLists.txt | 4 - reactos/dll/win32/mshtml/CMakeLists.txt | 1 - reactos/dll/win32/msi/CMakeLists.txt | 22 +---- reactos/dll/win32/msimg32/CMakeLists.txt | 3 - reactos/dll/win32/msnet32/CMakeLists.txt | 6 -- reactos/dll/win32/mspatcha/CMakeLists.txt | 1 - reactos/dll/win32/msports/CMakeLists.txt | 2 - reactos/dll/win32/mssign32/CMakeLists.txt | 1 - reactos/dll/win32/mssip32/CMakeLists.txt | 1 - reactos/dll/win32/msvcrt20/CMakeLists.txt | 6 +- reactos/dll/win32/msvcrt40/CMakeLists.txt | 7 +- reactos/dll/win32/mswsock/CMakeLists.txt | 3 - reactos/dll/win32/msxml/CMakeLists.txt | 5 - reactos/dll/win32/msxml2/CMakeLists.txt | 5 - reactos/dll/win32/msxml4/CMakeLists.txt | 5 - reactos/dll/win32/msxml6/CMakeLists.txt | 3 - reactos/dll/win32/nddeapi/CMakeLists.txt | 4 - reactos/dll/win32/netapi32/CMakeLists.txt | 4 - reactos/dll/win32/netcfgx/CMakeLists.txt | 1 + reactos/dll/win32/netshell/CMakeLists.txt | 18 +--- reactos/dll/win32/newdev/CMakeLists.txt | 2 - reactos/dll/win32/ntdsapi/CMakeLists.txt | 5 - reactos/dll/win32/ntlanman/CMakeLists.txt | 5 - reactos/dll/win32/ntmarta/CMakeLists.txt | 11 +-- reactos/dll/win32/ntprint/CMakeLists.txt | 2 +- reactos/dll/win32/objsel/CMakeLists.txt | 14 +-- reactos/dll/win32/odbccp32/CMakeLists.txt | 11 +-- reactos/dll/win32/ole32/CMakeLists.txt | 1 - reactos/dll/win32/oleaut32/CMakeLists.txt | 2 - reactos/dll/win32/olecli32/CMakeLists.txt | 3 +- reactos/dll/win32/olesvr32/CMakeLists.txt | 5 - reactos/dll/win32/olethk32/CMakeLists.txt | 1 - reactos/dll/win32/powrprof/CMakeLists.txt | 4 - reactos/dll/win32/psapi/CMakeLists.txt | 2 - reactos/dll/win32/pstorec/CMakeLists.txt | 1 - reactos/dll/win32/qmgrprxy/CMakeLists.txt | 4 - reactos/dll/win32/rasadhlp/CMakeLists.txt | 1 - reactos/dll/win32/rasapi32/CMakeLists.txt | 2 - reactos/dll/win32/resutils/CMakeLists.txt | 5 - reactos/dll/win32/rpcrt4/CMakeLists.txt | 5 +- reactos/dll/win32/rsabase/CMakeLists.txt | 2 - reactos/dll/win32/samsrv/CMakeLists.txt | 5 +- reactos/dll/win32/scrrun/CMakeLists.txt | 1 - reactos/dll/win32/secur32/CMakeLists.txt | 5 - reactos/dll/win32/setupapi/CMakeLists.txt | 13 +-- reactos/dll/win32/sfc/CMakeLists.txt | 3 - reactos/dll/win32/sfc_os/CMakeLists.txt | 2 - reactos/dll/win32/shdocvw/CMakeLists.txt | 1 - reactos/dll/win32/shell32/CMakeLists.txt | 29 +----- reactos/dll/win32/shfolder/CMakeLists.txt | 3 - reactos/dll/win32/shimgvw/CMakeLists.txt | 13 +-- reactos/dll/win32/smdll/CMakeLists.txt | 2 - reactos/dll/win32/sndblst/CMakeLists.txt | 3 - reactos/dll/win32/softpub/CMakeLists.txt | 7 +- reactos/dll/win32/srclient/CMakeLists.txt | 3 - reactos/dll/win32/stdole32.tlb/CMakeLists.txt | 3 - reactos/dll/win32/syssetup/CMakeLists.txt | 17 +--- reactos/dll/win32/t2embed/CMakeLists.txt | 6 -- reactos/dll/win32/traffic/CMakeLists.txt | 5 - reactos/dll/win32/uext2/CMakeLists.txt | 1 - reactos/dll/win32/ufat/CMakeLists.txt | 1 - reactos/dll/win32/ufatx/CMakeLists.txt | 3 - reactos/dll/win32/unicows/CMakeLists.txt | 22 +---- reactos/dll/win32/untfs/CMakeLists.txt | 1 - reactos/dll/win32/updspapi/CMakeLists.txt | 7 +- reactos/dll/win32/url/CMakeLists.txt | 1 - reactos/dll/win32/vdmdbg/CMakeLists.txt | 1 - reactos/dll/win32/wdmaud.drv/CMakeLists.txt | 9 +- .../dll/win32/windowscodecs/CMakeLists.txt | 1 - reactos/dll/win32/winfax/CMakeLists.txt | 3 - reactos/dll/win32/wing32/CMakeLists.txt | 4 - reactos/dll/win32/winhttp/CMakeLists.txt | 2 +- reactos/dll/win32/winmm/CMakeLists.txt | 4 +- .../dll/win32/winmm/midimap/CMakeLists.txt | 4 - reactos/dll/win32/wlanapi/CMakeLists.txt | 12 +-- reactos/dll/win32/wmi/CMakeLists.txt | 2 - reactos/dll/win32/ws2_32/CMakeLists.txt | 3 - reactos/dll/win32/ws2_32_new/CMakeLists.txt | 3 +- reactos/dll/win32/ws2help/CMakeLists.txt | 1 - reactos/dll/win32/wshirda/CMakeLists.txt | 2 - reactos/dll/win32/wshtcpip/CMakeLists.txt | 5 - reactos/dll/win32/wsock32/CMakeLists.txt | 3 - reactos/drivers/base/bootvid/CMakeLists.txt | 2 - reactos/drivers/base/condrv/CMakeLists.txt | 4 +- reactos/drivers/base/kdgdb/CMakeLists.txt | 9 +- reactos/drivers/base/kdrosdbg/CMakeLists.txt | 3 - reactos/drivers/base/nmidebug/CMakeLists.txt | 2 - reactos/drivers/base/null/CMakeLists.txt | 3 - reactos/drivers/battery/battc/CMakeLists.txt | 3 - .../drivers/bus/acpi/cmbatt/CMakeLists.txt | 3 - .../drivers/bus/acpi/compbatt/CMakeLists.txt | 2 - reactos/drivers/bus/pcix/CMakeLists.txt | 2 - reactos/drivers/crypto/ksecdd/CMakeLists.txt | 14 +-- .../drivers/filesystems/cdfs/CMakeLists.txt | 3 - .../filesystems/fastfat/CMakeLists.txt | 3 - .../filesystems/fastfat_new/CMakeLists.txt | 8 +- .../drivers/filesystems/msfs/CMakeLists.txt | 3 - .../drivers/filesystems/ntfs/CMakeLists.txt | 3 - .../drivers/filters/mountmgr/CMakeLists.txt | 1 - reactos/drivers/hid/hidclass/CMakeLists.txt | 1 - reactos/drivers/hid/hidparse/CMakeLists.txt | 3 - reactos/drivers/hid/hidusb/CMakeLists.txt | 2 - reactos/drivers/hid/kbdhid/CMakeLists.txt | 4 - reactos/drivers/hid/mouhid/CMakeLists.txt | 4 - reactos/drivers/ksfilter/ks/CMakeLists.txt | 1 - .../drivers/ksfilter/swenum/CMakeLists.txt | 7 +- reactos/drivers/network/afd/CMakeLists.txt | 1 - reactos/drivers/network/ndis/CMakeLists.txt | 6 +- .../drivers/network/ndisuio/CMakeLists.txt | 1 + reactos/drivers/network/tcpip/CMakeLists.txt | 9 +- .../drivers/parallel/parallel/CMakeLists.txt | 1 - .../storage/class/cdrom/CMakeLists.txt | 8 +- .../storage/class/cdrom_new/CMakeLists.txt | 9 +- .../storage/class/class2/CMakeLists.txt | 5 - .../drivers/storage/class/disk/CMakeLists.txt | 9 +- .../storage/class/disk_new/CMakeLists.txt | 11 +-- .../storage/class/ramdisk/CMakeLists.txt | 7 +- .../drivers/storage/classpnp/CMakeLists.txt | 10 +- .../drivers/storage/ide/atapi/CMakeLists.txt | 3 - .../drivers/storage/ide/pciide/CMakeLists.txt | 2 - .../storage/ide/pciidex/CMakeLists.txt | 1 - .../drivers/storage/ide/uniata/CMakeLists.txt | 1 - .../drivers/storage/scsiport/CMakeLists.txt | 1 - reactos/drivers/usb/usbccgp/CMakeLists.txt | 4 +- reactos/drivers/usb/usbd/CMakeLists.txt | 2 - reactos/drivers/usb/usbehci/CMakeLists.txt | 7 +- reactos/drivers/usb/usbhub/CMakeLists.txt | 2 - reactos/drivers/usb/usbohci/CMakeLists.txt | 7 +- reactos/drivers/usb/usbstor/CMakeLists.txt | 1 - reactos/drivers/usb/usbuhci/CMakeLists.txt | 10 +- .../audio/backpln/audio_test/CMakeLists.txt | 3 - .../wdm/audio/backpln/portcls/CMakeLists.txt | 5 +- .../audio/drivers/CMIDriver/CMakeLists.txt | 3 +- .../CMIDriver/cmicontrol/CMakeLists.txt | 20 +--- .../drivers/wdm/audio/drm/drmk/CMakeLists.txt | 4 - .../wdm/audio/filters/kmixer/CMakeLists.txt | 6 +- .../wdm/audio/legacy/wdmaud/CMakeLists.txt | 6 +- reactos/drivers/wmi/CMakeLists.txt | 3 - reactos/lib/3rdparty/bzip2/CMakeLists.txt | 1 - reactos/lib/3rdparty/zlib/CMakeLists.txt | 1 - reactos/lib/atl/CMakeLists.txt | 1 - reactos/lib/cryptlib/CMakeLists.txt | 3 +- reactos/lib/dnslib/CMakeLists.txt | 1 - reactos/lib/drivers/libusb/CMakeLists.txt | 4 +- reactos/lib/drivers/lwip/CMakeLists.txt | 2 + .../drivers/sound/libusbaudio/CMakeLists.txt | 1 - .../lib/drivers/sound/mmixer/CMakeLists.txt | 1 - .../lib/drivers/sound/stdunk/CMakeLists.txt | 3 +- reactos/lib/fslib/ntfslib/CMakeLists.txt | 1 - reactos/lib/gcc_ssp/CMakeLists.txt | 2 +- reactos/lib/recyclebin/CMakeLists.txt | 1 - reactos/lib/sdk/RunTmChk/CMakeLists.txt | 9 +- reactos/lib/sdk/comsupp/CMakeLists.txt | 1 - reactos/lib/sdk/cpprt/CMakeLists.txt | 1 + reactos/lib/sdk/crt/oldnames.cmake | 1 + reactos/media/CMakeLists.txt | 1 + reactos/media/fonts/CMakeLists.txt | 4 +- reactos/media/inf/CMakeLists.txt | 4 +- reactos/media/nls/CMakeLists.txt | 7 +- reactos/media/themes/CMakeLists.txt | 1 + .../themes/lautus.msstyles/CMakeLists.txt | 6 +- reactos/media/vgafonts/CMakeLists.txt | 5 +- reactos/modules/CMakeLists.txt | 6 +- reactos/subsystems/ntvdm/CMakeLists.txt | 3 +- reactos/subsystems/win/basesrv/CMakeLists.txt | 2 - .../subsystems/win32/csrsrv/CMakeLists.txt | 6 -- reactos/subsystems/win32/csrss/CMakeLists.txt | 3 - reactos/tools/CMakeLists.txt | 2 +- reactos/tools/cabman/CMakeLists.txt | 3 +- reactos/tools/cdmake/CMakeLists.txt | 2 +- reactos/tools/hpp/CMakeLists.txt | 1 + reactos/tools/log2lines/CMakeLists.txt | 2 +- reactos/tools/obj2bin/CMakeLists.txt | 1 + reactos/tools/rsym/CMakeLists.txt | 2 + reactos/tools/spec2def/CMakeLists.txt | 1 + reactos/tools/unicode/CMakeLists.txt | 1 - reactos/tools/utf16le/CMakeLists.txt | 1 + reactos/tools/widl/CMakeLists.txt | 10 +- reactos/tools/wpp/CMakeLists.txt | 5 +- reactos/win32ss/CMakeLists.txt | 9 +- .../drivers/displays/framebuf/CMakeLists.txt | 1 - .../drivers/displays/vga/CMakeLists.txt | 1 - .../win32ss/drivers/font/ftfd/CMakeLists.txt | 8 +- .../drivers/miniport/vga/CMakeLists.txt | 2 - .../drivers/miniport/vga_new/CMakeLists.txt | 3 - .../drivers/miniport/vmx_svga/CMakeLists.txt | 5 +- .../win32ss/drivers/videoprt/CMakeLists.txt | 4 - .../win32ss/drivers/watchdog/CMakeLists.txt | 1 - reactos/win32ss/gdi/gdi32/CMakeLists.txt | 21 +---- reactos/win32ss/reactx/dxapi/CMakeLists.txt | 2 - reactos/win32ss/reactx/dxgthk/CMakeLists.txt | 4 - reactos/win32ss/user/winsrv/CMakeLists.txt | 1 - reactos/win32ss/user/winsrv/consrv.cmake | 5 +- reactos/win32ss/user/winsrv/consrv_new.cmake | 2 - reactos/win32ss/user/winsrv/usersrv.cmake | 4 +- 367 files changed, 284 insertions(+), 1359 deletions(-) diff --git a/reactos/CMakeLists.txt b/reactos/CMakeLists.txt index 68d31b7aeb9..8cf8fb41c30 100644 --- a/reactos/CMakeLists.txt +++ b/reactos/CMakeLists.txt @@ -1,5 +1,5 @@ -cmake_minimum_required(VERSION 2.6) +cmake_minimum_required(VERSION 2.8) if(POLICY CMP0017) # Shadow cmake provided modules diff --git a/reactos/base/applications/atactl/CMakeLists.txt b/reactos/base/applications/atactl/CMakeLists.txt index c1885825833..0070358fae4 100644 --- a/reactos/base/applications/atactl/CMakeLists.txt +++ b/reactos/base/applications/atactl/CMakeLists.txt @@ -1,10 +1,8 @@ set_cpp() - add_definitions(-DUSER_MODE) include_directories(${REACTOS_SOURCE_DIR}/drivers/storage/ide/uniata) add_executable(atactl atactl.cpp atactl.rc) set_module_type(atactl win32cui) add_importlibs(atactl advapi32 msvcrt kernel32 ntdll) - add_cd_file(TARGET atactl DESTINATION reactos/system32 FOR all) diff --git a/reactos/base/applications/cmdutils/help/CMakeLists.txt b/reactos/base/applications/cmdutils/help/CMakeLists.txt index 4a2adc0d121..cce3258e592 100644 --- a/reactos/base/applications/cmdutils/help/CMakeLists.txt +++ b/reactos/base/applications/cmdutils/help/CMakeLists.txt @@ -1,10 +1,6 @@ -add_executable(cmd_help - help.c - help.rc) - +add_executable(cmd_help help.c help.rc) set_module_type(cmd_help win32cui UNICODE) -add_importlibs(cmd_help msvcrt kernel32 user32) - +add_importlibs(cmd_help user32 msvcrt kernel32) set_target_properties(cmd_help PROPERTIES OUTPUT_NAME "help") add_cd_file(TARGET cmd_help DESTINATION reactos/system32 FOR all) diff --git a/reactos/base/applications/cmdutils/hostname/CMakeLists.txt b/reactos/base/applications/cmdutils/hostname/CMakeLists.txt index fec5032e916..50b38605c12 100644 --- a/reactos/base/applications/cmdutils/hostname/CMakeLists.txt +++ b/reactos/base/applications/cmdutils/hostname/CMakeLists.txt @@ -1,6 +1,5 @@ add_executable(hostname hostname.c hostname.rc) - set_module_type(hostname win32cui UNICODE) add_importlibs(hostname user32 msvcrt kernel32) add_cd_file(TARGET hostname DESTINATION reactos/system32 FOR all) diff --git a/reactos/base/applications/cmdutils/lodctr/CMakeLists.txt b/reactos/base/applications/cmdutils/lodctr/CMakeLists.txt index 6cfbd44558c..9c2feaa2b16 100644 --- a/reactos/base/applications/cmdutils/lodctr/CMakeLists.txt +++ b/reactos/base/applications/cmdutils/lodctr/CMakeLists.txt @@ -1,7 +1,5 @@ - add_executable(lodctr lodctr_main.c) - set_module_type(lodctr win32cui UNICODE) add_importlibs(lodctr loadperf msvcrt kernel32) add_cd_file(TARGET lodctr DESTINATION reactos/system32 FOR all) diff --git a/reactos/base/applications/cmdutils/mode/CMakeLists.txt b/reactos/base/applications/cmdutils/mode/CMakeLists.txt index 354c426dd2b..bf53b6af767 100644 --- a/reactos/base/applications/cmdutils/mode/CMakeLists.txt +++ b/reactos/base/applications/cmdutils/mode/CMakeLists.txt @@ -2,6 +2,5 @@ add_executable(mode mode.c mode.rc) set_module_type(mode win32cui UNICODE) set_target_properties(mode PROPERTIES SUFFIX ".com") - add_importlibs(mode user32 msvcrt kernel32) add_cd_file(TARGET mode DESTINATION reactos/system32 FOR all) diff --git a/reactos/base/applications/cmdutils/more/CMakeLists.txt b/reactos/base/applications/cmdutils/more/CMakeLists.txt index 28fab89b700..9abb01648b6 100644 --- a/reactos/base/applications/cmdutils/more/CMakeLists.txt +++ b/reactos/base/applications/cmdutils/more/CMakeLists.txt @@ -2,6 +2,5 @@ add_executable(more more.c more.rc) set_module_type(more win32cui) set_target_properties(more PROPERTIES SUFFIX ".com") - add_importlibs(more user32 msvcrt kernel32) add_cd_file(TARGET more DESTINATION reactos/system32 FOR all) diff --git a/reactos/base/applications/games/solitaire/CMakeLists.txt b/reactos/base/applications/games/solitaire/CMakeLists.txt index 5172ccb304a..552812129b5 100644 --- a/reactos/base/applications/games/solitaire/CMakeLists.txt +++ b/reactos/base/applications/games/solitaire/CMakeLists.txt @@ -1,6 +1,5 @@ set_cpp(WITH_RUNTIME) - include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/cardlib) list(APPEND SOURCE diff --git a/reactos/base/applications/kbswitch/CMakeLists.txt b/reactos/base/applications/kbswitch/CMakeLists.txt index 6fe41a541c7..23d7831a200 100644 --- a/reactos/base/applications/kbswitch/CMakeLists.txt +++ b/reactos/base/applications/kbswitch/CMakeLists.txt @@ -3,4 +3,5 @@ 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/kbswitch/kbsdll/CMakeLists.txt b/reactos/base/applications/kbswitch/kbsdll/CMakeLists.txt index 8484ee6e39c..b192592cde0 100644 --- a/reactos/base/applications/kbswitch/kbsdll/CMakeLists.txt +++ b/reactos/base/applications/kbswitch/kbsdll/CMakeLists.txt @@ -1,5 +1,4 @@ - spec2def(kbsdll.dll kbsdll.spec) list(APPEND SOURCE @@ -8,7 +7,6 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/kbsdll.def) add_library(kbsdll SHARED ${SOURCE}) - set_module_type(kbsdll win32dll UNICODE) add_importlibs(kbsdll user32 comctl32 msvcrt kernel32) add_cd_file(TARGET kbsdll DESTINATION reactos/system32 FOR all) diff --git a/reactos/base/applications/mscutils/eventvwr/CMakeLists.txt b/reactos/base/applications/mscutils/eventvwr/CMakeLists.txt index fff7e3a7048..911f446555f 100644 --- a/reactos/base/applications/mscutils/eventvwr/CMakeLists.txt +++ b/reactos/base/applications/mscutils/eventvwr/CMakeLists.txt @@ -2,7 +2,9 @@ add_executable(eventvwr eventvwr.c eventvwr.rc) set_module_type(eventvwr win32gui UNICODE) add_importlibs(eventvwr user32 comctl32 comdlg32 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/network/arp/CMakeLists.txt b/reactos/base/applications/network/arp/CMakeLists.txt index 31e3066e219..7f86c4cb4ba 100644 --- a/reactos/base/applications/network/arp/CMakeLists.txt +++ b/reactos/base/applications/network/arp/CMakeLists.txt @@ -1,8 +1,5 @@ add_executable(arp arp.c arp.rc) - set_module_type(arp win32cui) - add_importlibs(arp iphlpapi ws2_32 shlwapi msvcrt kernel32) - add_cd_file(TARGET arp DESTINATION reactos/system32 FOR all) diff --git a/reactos/base/applications/network/dwnl/CMakeLists.txt b/reactos/base/applications/network/dwnl/CMakeLists.txt index 1e7329b4d83..ac0517d4786 100644 --- a/reactos/base/applications/network/dwnl/CMakeLists.txt +++ b/reactos/base/applications/network/dwnl/CMakeLists.txt @@ -1,12 +1,9 @@ - add_executable(dwnl dwnl.c) - set_module_type(dwnl win32cui UNICODE) - target_link_libraries(dwnl uuid) - add_importlibs(dwnl urlmon wininet msvcrt kernel32) + if(MSVC) add_importlibs(dwnl ntdll) endif() diff --git a/reactos/base/applications/network/netsh/CMakeLists.txt b/reactos/base/applications/network/netsh/CMakeLists.txt index 4b7f0047b0a..bf0265e1e13 100644 --- a/reactos/base/applications/network/netsh/CMakeLists.txt +++ b/reactos/base/applications/network/netsh/CMakeLists.txt @@ -1,8 +1,6 @@ add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/wine) - add_executable(netsh netsh.c) target_link_libraries(netsh wine) set_module_type(netsh win32cui UNICODE) diff --git a/reactos/base/applications/network/ping/CMakeLists.txt b/reactos/base/applications/network/ping/CMakeLists.txt index 003e90ecd62..141802a1638 100644 --- a/reactos/base/applications/network/ping/CMakeLists.txt +++ b/reactos/base/applications/network/ping/CMakeLists.txt @@ -3,7 +3,9 @@ add_definitions(-D__USE_W32_SOCKETS) add_executable(ping ping.c ping.rc) set_module_type(ping win32cui UNICODE) add_importlibs(ping user32 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/network/route/CMakeLists.txt b/reactos/base/applications/network/route/CMakeLists.txt index 3f78a6e16f8..bbb89e43739 100644 --- a/reactos/base/applications/network/route/CMakeLists.txt +++ b/reactos/base/applications/network/route/CMakeLists.txt @@ -1,7 +1,5 @@ - add_executable(route route.c route.rc) - set_module_type(route win32cui UNICODE) add_importlibs(route ws2_32 iphlpapi msvcrt kernel32) add_cd_file(TARGET route DESTINATION reactos/system32 FOR all) diff --git a/reactos/base/applications/network/tracert/CMakeLists.txt b/reactos/base/applications/network/tracert/CMakeLists.txt index 9b55089ec37..ec605ed89a6 100644 --- a/reactos/base/applications/network/tracert/CMakeLists.txt +++ b/reactos/base/applications/network/tracert/CMakeLists.txt @@ -1,13 +1,11 @@ add_definitions(-D__USE_W32_SOCKETS) - add_executable(tracert tracert.c tracert.rc) - set_module_type(tracert win32cui) - add_importlibs(tracert ws2_32 msvcrt kernel32) + if(MSVC) -add_importlibs(tracert ntdll) + add_importlibs(tracert ntdll) endif() add_cd_file(TARGET tracert DESTINATION reactos/system32 FOR all) diff --git a/reactos/base/applications/network/whois/CMakeLists.txt b/reactos/base/applications/network/whois/CMakeLists.txt index 755fc7a9818..be14ff50665 100644 --- a/reactos/base/applications/network/whois/CMakeLists.txt +++ b/reactos/base/applications/network/whois/CMakeLists.txt @@ -1,6 +1,5 @@ add_executable(whois whois.c whois.rc) - set_module_type(whois win32cui) add_importlibs(whois ws2_32 msvcrt kernel32) add_cd_file(TARGET whois DESTINATION reactos/system32 FOR all) diff --git a/reactos/base/applications/network/wlanconf/CMakeLists.txt b/reactos/base/applications/network/wlanconf/CMakeLists.txt index fe931b3a442..973abbdc316 100644 --- a/reactos/base/applications/network/wlanconf/CMakeLists.txt +++ b/reactos/base/applications/network/wlanconf/CMakeLists.txt @@ -2,8 +2,8 @@ include_directories( BEFORE include ${REACTOS_SOURCE_DIR}/include/reactos/drivers/ndisuio) -add_executable(wlanconf wlanconf.c wlanconf.rc) +add_executable(wlanconf wlanconf.c wlanconf.rc) set_module_type(wlanconf win32cui UNICODE) add_importlibs(wlanconf msvcrt user32 iphlpapi kernel32) add_cd_file(TARGET wlanconf DESTINATION reactos/system32 FOR all) diff --git a/reactos/base/applications/setup16/CMakeLists.txt b/reactos/base/applications/setup16/CMakeLists.txt index 9f1d652adee..9b8f5b9bcbe 100644 --- a/reactos/base/applications/setup16/CMakeLists.txt +++ b/reactos/base/applications/setup16/CMakeLists.txt @@ -1,5 +1,5 @@ add_executable(setup16 main.c) set_module_type(setup16 win32gui UNICODE) -add_importlibs(setup16 user32 gdi32 advapi32 msvcrt kernel32 shell32 setupapi) +add_importlibs(setup16 user32 gdi32 advapi32 shell32 setupapi msvcrt kernel32) 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 8d553e73c63..3d27bb64cdc 100644 --- a/reactos/base/applications/shutdown/CMakeLists.txt +++ b/reactos/base/applications/shutdown/CMakeLists.txt @@ -7,6 +7,6 @@ list(APPEND SOURCE add_executable(shutdown ${SOURCE} shutdown.rc) set_module_type(shutdown win32cui UNICODE) -add_importlibs(shutdown advapi32 user32 msvcrt powrprof kernel32) +add_importlibs(shutdown advapi32 user32 powrprof msvcrt kernel32) add_pch(shutdown precomp.h SOURCE) add_cd_file(TARGET shutdown DESTINATION reactos/system32 FOR all) diff --git a/reactos/base/applications/sndrec32/CMakeLists.txt b/reactos/base/applications/sndrec32/CMakeLists.txt index 72697a1c3c6..1319008d8ad 100644 --- a/reactos/base/applications/sndrec32/CMakeLists.txt +++ b/reactos/base/applications/sndrec32/CMakeLists.txt @@ -14,6 +14,6 @@ list(APPEND SOURCE add_executable(sndrec32 ${SOURCE} rsrc.rc) set_module_type(sndrec32 win32gui UNICODE) -add_importlibs(sndrec32 winmm user32 msacm32 comctl32 comdlg32 gdi32 msvcrt kernel32 shell32) +add_importlibs(sndrec32 winmm user32 msacm32 comctl32 comdlg32 gdi32 shell32 msvcrt kernel32) add_pch(sndrec32 stdafx.h SOURCE) add_cd_file(TARGET sndrec32 DESTINATION reactos/system32 FOR all) diff --git a/reactos/base/applications/wordpad/CMakeLists.txt b/reactos/base/applications/wordpad/CMakeLists.txt index 96f5f3c7db0..4a1c36e54f4 100644 --- a/reactos/base/applications/wordpad/CMakeLists.txt +++ b/reactos/base/applications/wordpad/CMakeLists.txt @@ -2,7 +2,6 @@ remove_definitions(-D_WIN32_IE=0x600) add_definitions(-D__ROS_LONG64__) - include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine) list(APPEND SOURCE @@ -13,7 +12,6 @@ list(APPEND SOURCE rsrc.rc) add_executable(wordpad ${SOURCE}) - set_module_type(wordpad win32gui) target_link_libraries(wordpad wine uuid) add_importlibs(wordpad comdlg32 ole32 shell32 user32 gdi32 advapi32 comctl32 msvcrt kernel32 ntdll) diff --git a/reactos/base/services/rpcss/CMakeLists.txt b/reactos/base/services/rpcss/CMakeLists.txt index 159479d3ea2..583cc039b88 100644 --- a/reactos/base/services/rpcss/CMakeLists.txt +++ b/reactos/base/services/rpcss/CMakeLists.txt @@ -14,15 +14,9 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/irot_s.c) include_directories(${REACTOS_BINARY_DIR}/include/reactos/wine) - add_executable(rpcss ${SOURCE} rpcss.rc) - -target_link_libraries(rpcss - ${PSEH_LIB} - wine) - +target_link_libraries(rpcss ${PSEH_LIB} wine) set_module_type(rpcss win32cui UNICODE) - add_importlibs(rpcss advapi32 rpcrt4 msvcrt kernel32 ntdll) add_pch(rpcss rpcss.h SOURCE) add_cd_file(TARGET rpcss DESTINATION reactos/system32 FOR all) diff --git a/reactos/base/services/spoolsv/CMakeLists.txt b/reactos/base/services/spoolsv/CMakeLists.txt index a9ae1b29554..1d4686ce2ff 100644 --- a/reactos/base/services/spoolsv/CMakeLists.txt +++ b/reactos/base/services/spoolsv/CMakeLists.txt @@ -1,9 +1,6 @@ - add_executable(spoolsv spoolsv.c spoolsv.rc) - target_link_libraries(spoolsv wine) - set_module_type(spoolsv win32cui UNICODE) add_importlibs(spoolsv advapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET spoolsv DESTINATION reactos/system32 FOR all) diff --git a/reactos/base/services/telnetd/CMakeLists.txt b/reactos/base/services/telnetd/CMakeLists.txt index f22c3e88ea9..28a1dbb536a 100644 --- a/reactos/base/services/telnetd/CMakeLists.txt +++ b/reactos/base/services/telnetd/CMakeLists.txt @@ -5,7 +5,6 @@ add_executable(telnetd telnetd.rc) target_link_libraries(telnetd wine) - set_module_type(telnetd win32cui) add_importlibs(telnetd advapi32 ws2_32 msvcrt kernel32 ntdll) add_cd_file(TARGET telnetd DESTINATION reactos/system32 FOR all) diff --git a/reactos/base/services/thmsvc/CMakeLists.txt b/reactos/base/services/thmsvc/CMakeLists.txt index 438f25dbe21..6b6360405bc 100644 --- a/reactos/base/services/thmsvc/CMakeLists.txt +++ b/reactos/base/services/thmsvc/CMakeLists.txt @@ -1,8 +1,6 @@ add_executable(thmsvc thmsvc.c thmsvc.rc) - target_link_libraries(thmsvc wine) - set_module_type(thmsvc win32cui UNICODE) add_importlibs(thmsvc uxtheme advapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET thmsvc DESTINATION reactos/system32 FOR all) diff --git a/reactos/base/services/umpnpmgr/CMakeLists.txt b/reactos/base/services/umpnpmgr/CMakeLists.txt index 5987acf4161..2aad52f943c 100644 --- a/reactos/base/services/umpnpmgr/CMakeLists.txt +++ b/reactos/base/services/umpnpmgr/CMakeLists.txt @@ -1,8 +1,6 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/idl) - add_rpc_files(server ${REACTOS_SOURCE_DIR}/include/reactos/idl/pnp.idl) - spec2def(umpnpmgr.dll umpnpmgr.spec ADD_IMPORTLIB) add_library(umpnpmgr SHARED @@ -12,10 +10,7 @@ add_library(umpnpmgr SHARED ${CMAKE_CURRENT_BINARY_DIR}/umpnpmgr_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/umpnpmgr.def) -target_link_libraries(umpnpmgr - wdmguid - ${PSEH_LIB}) - +target_link_libraries(umpnpmgr wdmguid ${PSEH_LIB}) set_module_type(umpnpmgr win32dll UNICODE) add_importlibs(umpnpmgr advapi32 rpcrt4 userenv shlwapi msvcrt kernel32 ntdll) add_cd_file(TARGET umpnpmgr DESTINATION reactos/system32 FOR all) diff --git a/reactos/base/services/wlansvc/CMakeLists.txt b/reactos/base/services/wlansvc/CMakeLists.txt index 7f146da50ab..eb4e57417bd 100644 --- a/reactos/base/services/wlansvc/CMakeLists.txt +++ b/reactos/base/services/wlansvc/CMakeLists.txt @@ -1,6 +1,5 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/idl) - add_rpc_files(server ${REACTOS_SOURCE_DIR}/include/reactos/idl/wlansvc.idl) list(APPEND SOURCE diff --git a/reactos/base/setup/setup/CMakeLists.txt b/reactos/base/setup/setup/CMakeLists.txt index 482ffe6fd1b..6eae7d22796 100644 --- a/reactos/base/setup/setup/CMakeLists.txt +++ b/reactos/base/setup/setup/CMakeLists.txt @@ -1,7 +1,5 @@ - add_executable(setup setup.c setup.rc) - set_module_type(setup win32gui UNICODE) add_importlibs(setup userenv msvcrt kernel32 ntdll) add_cd_file(TARGET setup DESTINATION reactos/system32 FOR all) diff --git a/reactos/base/setup/usetup/CMakeLists.txt b/reactos/base/setup/usetup/CMakeLists.txt index a53984ebb8e..b6125f573b1 100644 --- a/reactos/base/setup/usetup/CMakeLists.txt +++ b/reactos/base/setup/usetup/CMakeLists.txt @@ -1,5 +1,6 @@ add_definitions(${I18N_DEFS}) + include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${REACTOS_SOURCE_DIR}/lib/inflib diff --git a/reactos/base/shell/explorer-new/CMakeLists.txt b/reactos/base/shell/explorer-new/CMakeLists.txt index 55ccc90a6a1..2d53be75fa8 100644 --- a/reactos/base/shell/explorer-new/CMakeLists.txt +++ b/reactos/base/shell/explorer-new/CMakeLists.txt @@ -19,20 +19,6 @@ list(APPEND SOURCE add_executable(explorer_new ${SOURCE} explorer.rc) 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 - shdocvw - version - uxtheme - msvcrt - kernel32 - ntdll) +add_importlibs(explorer_new advapi32 gdi32 user32 comctl32 ole32 oleaut32 shell32 shlwapi shdocvw version uxtheme msvcrt kernel32 ntdll) add_pch(explorer_new precomp.h SOURCE) 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 abd294df4de..518cf43d257 100644 --- a/reactos/base/shell/explorer/CMakeLists.txt +++ b/reactos/base/shell/explorer/CMakeLists.txt @@ -54,7 +54,6 @@ add_executable(explorer target_link_libraries(explorer comsupp wine uuid) set_module_type(explorer win32gui UNICODE) - add_importlibs(explorer advapi32 gdi32 user32 ws2_32 msimg32 comctl32 ole32 oleaut32 shell32 shlwapi notifyhook msvcrt kernel32 ntdll) add_pch(explorer precomp.h SOURCE) add_dependencies(explorer psdk) diff --git a/reactos/base/system/autochk/CMakeLists.txt b/reactos/base/system/autochk/CMakeLists.txt index b132b6c3935..ba720da364d 100644 --- a/reactos/base/system/autochk/CMakeLists.txt +++ b/reactos/base/system/autochk/CMakeLists.txt @@ -1,8 +1,6 @@ add_executable(autochk WIN32 autochk.c autochk.rc) - set_module_type(autochk nativecui) - target_link_libraries(autochk nt) add_importlibs(autochk ntdll) add_cd_file(TARGET autochk DESTINATION reactos/system32 FOR all) diff --git a/reactos/base/system/bootok/CMakeLists.txt b/reactos/base/system/bootok/CMakeLists.txt index 216a0fc8d9e..22bc0ece964 100644 --- a/reactos/base/system/bootok/CMakeLists.txt +++ b/reactos/base/system/bootok/CMakeLists.txt @@ -1,7 +1,5 @@ - add_executable(bootok bootok.c bootok.rc) - set_module_type(bootok win32cui UNICODE) add_importlibs(bootok advapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET bootok DESTINATION reactos/system32 FOR all) diff --git a/reactos/base/system/diskpart/CMakeLists.txt b/reactos/base/system/diskpart/CMakeLists.txt index f1cbf96abe3..7271df646af 100644 --- a/reactos/base/system/diskpart/CMakeLists.txt +++ b/reactos/base/system/diskpart/CMakeLists.txt @@ -42,9 +42,11 @@ list(APPEND SOURCE add_executable(diskpart ${SOURCE} diskpart.rc) set_module_type(diskpart win32cui UNICODE) -add_importlibs(diskpart user32 msvcrt advapi32 kernel32) +add_importlibs(diskpart user32 advapi32 msvcrt kernel32) + if(MSVC) - add_importlibs(diskpart ntdll) + add_importlibs(diskpart ntdll) endif() + add_pch(diskpart diskpart.h SOURCE) add_cd_file(TARGET diskpart DESTINATION reactos/system32 FOR all) diff --git a/reactos/base/system/expand/CMakeLists.txt b/reactos/base/system/expand/CMakeLists.txt index 5a680bfa97c..db4f8f30462 100644 --- a/reactos/base/system/expand/CMakeLists.txt +++ b/reactos/base/system/expand/CMakeLists.txt @@ -1,8 +1,6 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - add_executable(expand expand.c expand.rc) - set_module_type(expand win32cui) add_importlibs(expand lz32 setupapi user32 msvcrt kernel32 ntdll) add_cd_file(TARGET expand DESTINATION reactos/system32 FOR all) diff --git a/reactos/base/system/format/CMakeLists.txt b/reactos/base/system/format/CMakeLists.txt index 0907bc0490a..68ca5461923 100644 --- a/reactos/base/system/format/CMakeLists.txt +++ b/reactos/base/system/format/CMakeLists.txt @@ -2,6 +2,5 @@ add_executable(format format.c format.rc) set_module_type(format win32cui) set_target_properties(format PROPERTIES SUFFIX ".com") - add_importlibs(format user32 fmifs msvcrt kernel32 ntdll) add_cd_file(TARGET format DESTINATION reactos/system32 FOR all) diff --git a/reactos/base/system/lsass/CMakeLists.txt b/reactos/base/system/lsass/CMakeLists.txt index def568ae356..46ca92bfec7 100644 --- a/reactos/base/system/lsass/CMakeLists.txt +++ b/reactos/base/system/lsass/CMakeLists.txt @@ -1,9 +1,6 @@ - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys) - add_executable(lsass lsass.c lsass.rc) - set_module_type(lsass win32gui UNICODE) add_importlibs(lsass advapi32 lsasrv samsrv msvcrt kernel32 ntdll) add_cd_file(TARGET lsass DESTINATION reactos/system32 FOR all) diff --git a/reactos/base/system/msiexec/CMakeLists.txt b/reactos/base/system/msiexec/CMakeLists.txt index c267c0947a5..e8c8fba0571 100644 --- a/reactos/base/system/msiexec/CMakeLists.txt +++ b/reactos/base/system/msiexec/CMakeLists.txt @@ -1,6 +1,5 @@ add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/wine) list(APPEND SOURCE @@ -9,7 +8,6 @@ list(APPEND SOURCE precomp.h) add_executable(msiexec ${SOURCE} rsrc.rc) - set_module_type(msiexec win32gui) target_link_libraries(msiexec uuid wine) add_importlibs(msiexec user32 advapi32 ole32 msi msvcrt kernel32 ntdll) diff --git a/reactos/base/system/rundll32/CMakeLists.txt b/reactos/base/system/rundll32/CMakeLists.txt index 078d85aa103..9eef981f0b4 100644 --- a/reactos/base/system/rundll32/CMakeLists.txt +++ b/reactos/base/system/rundll32/CMakeLists.txt @@ -1,3 +1,4 @@ + add_executable(rundll32 rundll32.c rundll32.rc) set_module_type(rundll32 win32gui UNICODE) add_importlibs(rundll32 user32 msvcrt kernel32 ntdll) diff --git a/reactos/base/system/services/CMakeLists.txt b/reactos/base/system/services/CMakeLists.txt index c3ea514db36..31b4b58e69e 100644 --- a/reactos/base/system/services/CMakeLists.txt +++ b/reactos/base/system/services/CMakeLists.txt @@ -6,7 +6,6 @@ include_directories( add_rpc_files(server ${REACTOS_SOURCE_DIR}/include/reactos/idl/svcctl.idl) - list(APPEND SOURCE config.c controlset.c diff --git a/reactos/boot/bootdata/packages/CMakeLists.txt b/reactos/boot/bootdata/packages/CMakeLists.txt index f9d1e847acc..9c3ca3f50db 100644 --- a/reactos/boot/bootdata/packages/CMakeLists.txt +++ b/reactos/boot/bootdata/packages/CMakeLists.txt @@ -28,8 +28,7 @@ add_custom_command( ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff.maydiff ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/reactos.dff.in - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff.dyn -) + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff.dyn) add_custom_target( reactos_cab_inf @@ -41,4 +40,3 @@ add_cd_file( FILE ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf DESTINATION reactos NO_CAB FOR bootcd regtest) - diff --git a/reactos/boot/freeldr/bootsect/CMakeLists.txt b/reactos/boot/freeldr/bootsect/CMakeLists.txt index 51b0ebb1d85..881c84d5712 100644 --- a/reactos/boot/freeldr/bootsect/CMakeLists.txt +++ b/reactos/boot/freeldr/bootsect/CMakeLists.txt @@ -1,19 +1,18 @@ if(ARCH STREQUAL "i386" OR ARCH STREQUAL "amd64") -CreateBootSectorTarget(dosmbr ${CMAKE_CURRENT_SOURCE_DIR}/dosmbr.S ${CMAKE_CURRENT_BINARY_DIR}/dosmbr.bin 7c00) -CreateBootSectorTarget(ext2 ${CMAKE_CURRENT_SOURCE_DIR}/ext2.S ${CMAKE_CURRENT_BINARY_DIR}/ext2.bin 0) -CreateBootSectorTarget(fat32 ${CMAKE_CURRENT_SOURCE_DIR}/fat32.S ${CMAKE_CURRENT_BINARY_DIR}/fat32.bin 7c00) -CreateBootSectorTarget(fat ${CMAKE_CURRENT_SOURCE_DIR}/fatx.S ${CMAKE_CURRENT_BINARY_DIR}/fat.bin 7c00) -CreateBootSectorTarget(isoboot ${CMAKE_CURRENT_SOURCE_DIR}/isoboot.S ${CMAKE_CURRENT_BINARY_DIR}/isoboot.bin 7000) -CreateBootSectorTarget(isobtrt ${CMAKE_CURRENT_SOURCE_DIR}/isobtrt.S ${CMAKE_CURRENT_BINARY_DIR}/isobtrt.bin 7000) + CreateBootSectorTarget(dosmbr ${CMAKE_CURRENT_SOURCE_DIR}/dosmbr.S ${CMAKE_CURRENT_BINARY_DIR}/dosmbr.bin 7c00) + CreateBootSectorTarget(ext2 ${CMAKE_CURRENT_SOURCE_DIR}/ext2.S ${CMAKE_CURRENT_BINARY_DIR}/ext2.bin 0) + CreateBootSectorTarget(fat32 ${CMAKE_CURRENT_SOURCE_DIR}/fat32.S ${CMAKE_CURRENT_BINARY_DIR}/fat32.bin 7c00) + CreateBootSectorTarget(fat ${CMAKE_CURRENT_SOURCE_DIR}/fatx.S ${CMAKE_CURRENT_BINARY_DIR}/fat.bin 7c00) + CreateBootSectorTarget(isoboot ${CMAKE_CURRENT_SOURCE_DIR}/isoboot.S ${CMAKE_CURRENT_BINARY_DIR}/isoboot.bin 7000) + CreateBootSectorTarget(isobtrt ${CMAKE_CURRENT_SOURCE_DIR}/isobtrt.S ${CMAKE_CURRENT_BINARY_DIR}/isobtrt.bin 7000) -add_cd_file(TARGET dosmbr DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/dosmbr.bin FOR all) -add_cd_file(TARGET fat32 DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/fat32.bin FOR all) -add_cd_file(TARGET fat DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/fat.bin FOR all) -add_cd_file(TARGET isoboot DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/isoboot.bin FOR all) -add_cd_file(TARGET isobtrt DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/isobtrt.bin FOR all) -add_cd_file(TARGET ext2 DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/ext2.bin FOR all) + add_cd_file(TARGET dosmbr DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/dosmbr.bin FOR all) + add_cd_file(TARGET fat32 DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/fat32.bin FOR all) + add_cd_file(TARGET fat DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/fat.bin FOR all) + add_cd_file(TARGET isoboot DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/isoboot.bin FOR all) + add_cd_file(TARGET isobtrt DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/isobtrt.bin FOR all) + add_cd_file(TARGET ext2 DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/ext2.bin FOR all) endif() - diff --git a/reactos/boot/freeldr/freeldr/CMakeLists.txt b/reactos/boot/freeldr/freeldr/CMakeLists.txt index 9e8c355ad03..b25d7f95340 100644 --- a/reactos/boot/freeldr/freeldr/CMakeLists.txt +++ b/reactos/boot/freeldr/freeldr/CMakeLists.txt @@ -210,7 +210,7 @@ endif() target_link_libraries(freeldr_pe freeldr_common cportlib cmlib rtl libcntpr) target_link_libraries(freeldr_pe_dbg freeldr_common cportlib cmlib rtl libcntpr) -if (STACK_PROTECTOR) +if(STACK_PROTECTOR) target_link_libraries(freeldr_pe gcc_ssp) target_link_libraries(freeldr_pe_dbg gcc_ssp) endif() @@ -229,8 +229,7 @@ add_custom_target(freeldr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys) add_cd_file(TARGET freeldr FILE ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys DESTINATION loader NO_CAB FOR bootcd regtest) add_cd_file(TARGET freeldr FILE ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys DESTINATION loader NO_CAB FOR livecd NAME_ON_CD setupldr.sys) -list(APPEND SETUPLDR_SOURCE - inffile/inffile.c) +list(APPEND SETUPLDR_SOURCE inffile/inffile.c) if(ARCH STREQUAL "i386" OR ARCH STREQUAL "amd64") list(APPEND SETUPLDR_SOURCE windows/setupldr.c) @@ -271,7 +270,7 @@ endif() target_link_libraries(setupldr_pe freeldr_common cportlib cmlib rtl libcntpr) target_link_libraries(setupldr_pe_dbg freeldr_common cportlib cmlib rtl libcntpr) -if (STACK_PROTECTOR) +if(STACK_PROTECTOR) target_link_libraries(setupldr_pe gcc_ssp) target_link_libraries(setupldr_pe_dbg gcc_ssp) endif() diff --git a/reactos/boot/freeldr/install/CMakeLists.txt b/reactos/boot/freeldr/install/CMakeLists.txt index cca907cabf5..8379b3172d6 100644 --- a/reactos/boot/freeldr/install/CMakeLists.txt +++ b/reactos/boot/freeldr/install/CMakeLists.txt @@ -4,5 +4,4 @@ add_executable(installfreeldr EXCLUDE_FROM_ALL volume.c) set_module_type(installfreeldr win32cui) - add_importlibs(installfreeldr msvcrt kernel32) diff --git a/reactos/dll/3rdparty/dxtn/CMakeLists.txt b/reactos/dll/3rdparty/dxtn/CMakeLists.txt index d4b2425c039..37b33b3549c 100644 --- a/reactos/dll/3rdparty/dxtn/CMakeLists.txt +++ b/reactos/dll/3rdparty/dxtn/CMakeLists.txt @@ -9,9 +9,5 @@ add_library(dxtn SHARED ${CMAKE_CURRENT_BINARY_DIR}/dxtn.def) set_entrypoint(dxtn 0) - add_importlibs(dxtn msvcrt) - -add_dependencies(dxtn psdk) - add_cd_file(TARGET dxtn DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/3rdparty/libjpeg/CMakeLists.txt b/reactos/dll/3rdparty/libjpeg/CMakeLists.txt index bd04bafc395..3203ca2b663 100644 --- a/reactos/dll/3rdparty/libjpeg/CMakeLists.txt +++ b/reactos/dll/3rdparty/libjpeg/CMakeLists.txt @@ -60,5 +60,4 @@ add_library(libjpeg SHARED set_module_type(libjpeg win32dll) add_importlibs(libjpeg msvcrt kernel32) -add_dependencies(libjpeg psdk) add_cd_file(TARGET libjpeg DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/3rdparty/libtiff/CMakeLists.txt b/reactos/dll/3rdparty/libtiff/CMakeLists.txt index 6ea7bb06e29..03736259bf6 100644 --- a/reactos/dll/3rdparty/libtiff/CMakeLists.txt +++ b/reactos/dll/3rdparty/libtiff/CMakeLists.txt @@ -55,7 +55,6 @@ add_library(libtiff SHARED ${SOURCE}) set_module_type(libtiff win32dll) target_link_libraries(libtiff zlib getopt) add_importlibs(libtiff user32 msvcrt kernel32 ntdll) -add_dependencies(libtiff psdk) add_pch(libtiff precomp.h SOURCE) add_cd_file(TARGET libtiff DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/3rdparty/libxslt/CMakeLists.txt b/reactos/dll/3rdparty/libxslt/CMakeLists.txt index 648ca8d4a62..690ff020e52 100644 --- a/reactos/dll/3rdparty/libxslt/CMakeLists.txt +++ b/reactos/dll/3rdparty/libxslt/CMakeLists.txt @@ -39,11 +39,11 @@ add_library(libxslt SHARED ${SOURCE}) set_module_type(libxslt win32dll) target_link_libraries(libxslt libxml2 iconv-static zlib) add_importlibs(libxslt msvcrt ws2_32 kernel32) + if(MSVC) add_importlibs(libxslt ntdll) endif() -add_dependencies(libxslt psdk) add_pch(libxslt precomp.h SOURCE) add_cd_file(TARGET libxslt DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/cpl/appwiz/CMakeLists.txt b/reactos/dll/cpl/appwiz/CMakeLists.txt index 9c3ea4827b6..acb3c8307b2 100644 --- a/reactos/dll/cpl/appwiz/CMakeLists.txt +++ b/reactos/dll/cpl/appwiz/CMakeLists.txt @@ -1,11 +1,9 @@ -include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine) - remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) add_definitions(-D__WINESRC__) - +include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(appwiz.cpl appwiz.spec) list(APPEND SOURCE diff --git a/reactos/dll/cpl/console/CMakeLists.txt b/reactos/dll/cpl/console/CMakeLists.txt index 245bc2bab02..c65229af0f8 100644 --- a/reactos/dll/cpl/console/CMakeLists.txt +++ b/reactos/dll/cpl/console/CMakeLists.txt @@ -20,14 +20,6 @@ add_library(console SHARED set_module_type(console cpl UNICODE) set_target_properties(console PROPERTIES SUFFIX ".dll") - -add_importlibs(console - msvcrt - user32 - gdi32 - comctl32 - kernel32 - ntdll) - +add_importlibs(console user32 gdi32 comctl32 msvcrt kernel32 ntdll) add_pch(console console.h SOURCE) add_cd_file(TARGET console DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/cpl/desk/CMakeLists.txt b/reactos/dll/cpl/desk/CMakeLists.txt index 7ff759c6084..41cfa724712 100644 --- a/reactos/dll/cpl/desk/CMakeLists.txt +++ b/reactos/dll/cpl/desk/CMakeLists.txt @@ -30,21 +30,6 @@ add_library(desk SHARED set_module_type(desk cpl UNICODE) target_link_libraries(desk uuid) - -add_importlibs(desk - msvcrt - user32 - advapi32 - gdi32 - comctl32 - comdlg32 - ole32 - setupapi - shell32 - shlwapi - uxtheme - kernel32 - ntdll) - +add_importlibs(desk user32 advapi32 gdi32 comctl32 comdlg32 ole32 setupapi shell32 shlwapi uxtheme msvcrt kernel32 ntdll) add_pch(desk desk.h SOURCE) add_cd_file(TARGET desk DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/cpl/hdwwiz/CMakeLists.txt b/reactos/dll/cpl/hdwwiz/CMakeLists.txt index accc2fe2538..aa4a1496b07 100644 --- a/reactos/dll/cpl/hdwwiz/CMakeLists.txt +++ b/reactos/dll/cpl/hdwwiz/CMakeLists.txt @@ -1,18 +1,11 @@ spec2def(hdwwiz.cpl hdwwiz.spec) -add_library(hdwwiz SHARED hdwwiz.c hdwwiz.rc ${CMAKE_CURRENT_BINARY_DIR}/hdwwiz.def) + +add_library(hdwwiz SHARED + hdwwiz.c + hdwwiz.rc + ${CMAKE_CURRENT_BINARY_DIR}/hdwwiz.def) + set_module_type(hdwwiz cpl UNICODE) - -add_importlibs(hdwwiz - msvcrt - setupapi - advapi32 - comctl32 - rpcrt4 - user32 - gdi32 - devmgr - kernel32 - ntdll) - +add_importlibs(hdwwiz setupapi advapi32 comctl32 rpcrt4 user32 gdi32 devmgr msvcrt kernel32 ntdll) add_cd_file(TARGET hdwwiz DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/cpl/hotplug/CMakeLists.txt b/reactos/dll/cpl/hotplug/CMakeLists.txt index c5ec3d68ceb..46c8d3de2dc 100644 --- a/reactos/dll/cpl/hotplug/CMakeLists.txt +++ b/reactos/dll/cpl/hotplug/CMakeLists.txt @@ -1,25 +1,15 @@ - spec2def(hotplug.dll hotplug.spec) list(APPEND SOURCE hotplug.c - enum.c + enum.c) + +add_library(hotplug SHARED + ${SOURCE} hotplug.rc ${CMAKE_CURRENT_BINARY_DIR}/hotplug.def) -add_library(hotplug SHARED ${SOURCE}) - set_module_type(hotplug win32dll UNICODE) - -add_importlibs(hotplug - msvcrt - user32 - gdi32 - advapi32 - ntdll - setupapi - comctl32 - kernel32) - +add_importlibs(hotplug user32 gdi32 advapi32 setupapi comctl32 msvcrt kernel32 ntdll) add_cd_file(TARGET hotplug DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/cpl/input/CMakeLists.txt b/reactos/dll/cpl/input/CMakeLists.txt index 6a262f5da32..a04dbc0026e 100644 --- a/reactos/dll/cpl/input/CMakeLists.txt +++ b/reactos/dll/cpl/input/CMakeLists.txt @@ -16,14 +16,6 @@ add_library(input SHARED ${CMAKE_CURRENT_BINARY_DIR}/input.def) set_module_type(input win32dll UNICODE) - -add_importlibs(input - msvcrt - advapi32 - user32 - comctl32 - gdi32 - kernel32) - +add_importlibs(input advapi32 user32 comctl32 gdi32 msvcrt kernel32) add_pch(input input.h SOURCE) add_cd_file(TARGET input DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/cpl/intl/CMakeLists.txt b/reactos/dll/cpl/intl/CMakeLists.txt index 22811a68921..47ece397e4f 100644 --- a/reactos/dll/cpl/intl/CMakeLists.txt +++ b/reactos/dll/cpl/intl/CMakeLists.txt @@ -22,16 +22,6 @@ add_library(intl SHARED ${CMAKE_CURRENT_BINARY_DIR}/intl.def) set_module_type(intl cpl UNICODE) - -add_importlibs(intl - msvcrt - user32 - comctl32 - advapi32 - setupapi - shell32 - kernel32 - ntdll) - +add_importlibs(intl user32 comctl32 advapi32 setupapi shell32 msvcrt kernel32 ntdll) add_pch(intl intl.h SOURCE) add_cd_file(TARGET intl DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/cpl/joy/CMakeLists.txt b/reactos/dll/cpl/joy/CMakeLists.txt index d0759ae1cf8..5bee7b4561d 100644 --- a/reactos/dll/cpl/joy/CMakeLists.txt +++ b/reactos/dll/cpl/joy/CMakeLists.txt @@ -1,16 +1,12 @@ spec2def(joy.cpl joy.spec) -add_library(joy SHARED joy.c joy.rc ${CMAKE_CURRENT_BINARY_DIR}/joy.def) + +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 - user32 - comctl32 - ole32 - shell32 - msvcrt - kernel32 - ntdll) - +add_importlibs(joy user32 comctl32 ole32 shell32 msvcrt kernel32 ntdll) add_cd_file(TARGET joy DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/cpl/main/CMakeLists.txt b/reactos/dll/cpl/main/CMakeLists.txt index e17d27239e6..e450ddb9f59 100644 --- a/reactos/dll/cpl/main/CMakeLists.txt +++ b/reactos/dll/cpl/main/CMakeLists.txt @@ -14,17 +14,6 @@ add_library(main SHARED set_module_type(main cpl UNICODE) target_link_libraries(main uuid) - -add_importlibs(main - msvcrt - advapi32 - user32 - comctl32 - devmgr - comdlg32 - shell32 - gdi32 - kernel32) - +add_importlibs(main advapi32 user32 comctl32 devmgr comdlg32 shell32 gdi32 msvcrt kernel32) add_pch(main main.h SOURCE) add_cd_file(TARGET main DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/cpl/mmsys/CMakeLists.txt b/reactos/dll/cpl/mmsys/CMakeLists.txt index 51b77650d19..2409162138c 100644 --- a/reactos/dll/cpl/mmsys/CMakeLists.txt +++ b/reactos/dll/cpl/mmsys/CMakeLists.txt @@ -15,21 +15,6 @@ add_library(mmsys SHARED ${CMAKE_CURRENT_BINARY_DIR}/mmsys.def) set_module_type(mmsys cpl UNICODE) - -add_importlibs(mmsys - msvcrt - user32 - comctl32 - devmgr - gdi32 - winmm - advapi32 - shell32 - setupapi - shlwapi - ntdll - kernel32 - comdlg32) - +add_importlibs(mmsys user32 comctl32 devmgr gdi32 winmm advapi32 shell32 setupapi shlwapi comdlg32 msvcrt kernel32 ntdll) add_pch(mmsys mmsys.h SOURCE) add_cd_file(TARGET mmsys DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/cpl/ncpa/CMakeLists.txt b/reactos/dll/cpl/ncpa/CMakeLists.txt index 4c645543fb5..2d92f48ba16 100644 --- a/reactos/dll/cpl/ncpa/CMakeLists.txt +++ b/reactos/dll/cpl/ncpa/CMakeLists.txt @@ -1,15 +1,10 @@ - spec2def(ncpa.cpl ncpa.spec) -add_library(ncpa SHARED ncpa.c ${CMAKE_CURRENT_BINARY_DIR}/ncpa.def) +add_library(ncpa SHARED + ncpa.c + ${CMAKE_CURRENT_BINARY_DIR}/ncpa.def) set_module_type(ncpa cpl UNICODE) - -add_importlibs(ncpa - msvcrt - advapi32 - shell32 - kernel32) - +add_importlibs(ncpa advapi32 shell32 msvcrt kernel32) add_cd_file(TARGET ncpa DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/cpl/odbccp32/CMakeLists.txt b/reactos/dll/cpl/odbccp32/CMakeLists.txt index 10010457c97..950940e9c7a 100644 --- a/reactos/dll/cpl/odbccp32/CMakeLists.txt +++ b/reactos/dll/cpl/odbccp32/CMakeLists.txt @@ -1,5 +1,4 @@ - spec2def(odbccp32i.cpl odbccp32.spec) add_library(odbccp32i SHARED @@ -8,6 +7,5 @@ add_library(odbccp32i SHARED ${CMAKE_CURRENT_BINARY_DIR}/odbccp32i.def) set_module_type(odbccp32i cpl UNICODE) - add_importlibs(odbccp32i user32 comctl32 msvcrt kernel32) add_cd_file(TARGET odbccp32i DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/cpl/powercfg/CMakeLists.txt b/reactos/dll/cpl/powercfg/CMakeLists.txt index 93fb40acc72..99f8354fe05 100644 --- a/reactos/dll/cpl/powercfg/CMakeLists.txt +++ b/reactos/dll/cpl/powercfg/CMakeLists.txt @@ -15,16 +15,6 @@ add_library(powercfg SHARED ${CMAKE_CURRENT_BINARY_DIR}/powercfg.def) set_module_type(powercfg cpl UNICODE) - -add_importlibs(powercfg - msvcrt - user32 - powrprof - comctl32 - shell32 - advapi32 - kernel32 - ntdll) - +add_importlibs(powercfg user32 powrprof comctl32 shell32 advapi32 msvcrt kernel32 ntdll) add_pch(powercfg powercfg.h SOURCE) add_cd_file(TARGET powercfg DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/cpl/sysdm/CMakeLists.txt b/reactos/dll/cpl/sysdm/CMakeLists.txt index c1ea10b71c6..c5ddac54d4c 100644 --- a/reactos/dll/cpl/sysdm/CMakeLists.txt +++ b/reactos/dll/cpl/sysdm/CMakeLists.txt @@ -20,21 +20,6 @@ add_library(sysdm SHARED ${CMAKE_CURRENT_BINARY_DIR}/sysdm.def) set_module_type(sysdm cpl UNICODE) - -add_importlibs(sysdm - msvcrt - advapi32 - setupapi - user32 - gdi32 - comctl32 - msimg32 - shell32 - shlwapi - ole32 - powrprof - kernel32 - ntdll) - +add_importlibs(sysdm advapi32 setupapi user32 gdi32 comctl32 msimg32 shell32 shlwapi ole32 powrprof msvcrt kernel32 ntdll) add_pch(sysdm precomp.h SOURCE) add_cd_file(TARGET sysdm DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/cpl/telephon/CMakeLists.txt b/reactos/dll/cpl/telephon/CMakeLists.txt index cb537055477..000279ceabb 100644 --- a/reactos/dll/cpl/telephon/CMakeLists.txt +++ b/reactos/dll/cpl/telephon/CMakeLists.txt @@ -1,16 +1,12 @@ spec2def(telephon.cpl telephon.spec) -add_library(telephon SHARED telephon.c telephon.rc ${CMAKE_CURRENT_BINARY_DIR}/telephon.def) + +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 - advapi32 - user32 - comctl32 - ole32 - shell32 - msvcrt - kernel32) - +add_importlibs(telephon advapi32 user32 comctl32 ole32 shell32 msvcrt kernel32) add_cd_file(TARGET telephon DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/cpl/timedate/CMakeLists.txt b/reactos/dll/cpl/timedate/CMakeLists.txt index 5d87b27e648..21e5c84a7cc 100644 --- a/reactos/dll/cpl/timedate/CMakeLists.txt +++ b/reactos/dll/cpl/timedate/CMakeLists.txt @@ -17,16 +17,6 @@ add_library(timedate SHARED ${CMAKE_CURRENT_BINARY_DIR}/timedate.def) set_module_type(timedate cpl UNICODE) - -add_importlibs(timedate - advapi32 - user32 - gdi32 - comctl32 - ws2_32 - iphlpapi - msvcrt - kernel32) - +add_importlibs(timedate advapi32 user32 gdi32 comctl32 ws2_32 iphlpapi msvcrt kernel32) add_pch(timedate timedate.h SOURCE) add_cd_file(TARGET timedate DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/cpl/usrmgr/CMakeLists.txt b/reactos/dll/cpl/usrmgr/CMakeLists.txt index 4a8a5ab7bbf..5ef0c1befb3 100644 --- a/reactos/dll/cpl/usrmgr/CMakeLists.txt +++ b/reactos/dll/cpl/usrmgr/CMakeLists.txt @@ -1,6 +1,5 @@ include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(usrmgr.cpl usrmgr.spec) list(APPEND SOURCE @@ -19,16 +18,6 @@ add_library(usrmgr SHARED ${CMAKE_CURRENT_BINARY_DIR}/usrmgr.def) set_module_type(usrmgr cpl UNICODE) - -add_importlibs(usrmgr - advapi32 - user32 - gdi32 - comctl32 - netapi32 - msvcrt - kernel32 - ntdll) - +add_importlibs(usrmgr advapi32 user32 gdi32 comctl32 netapi32 msvcrt kernel32 ntdll) add_pch(usrmgr usrmgr.h SOURCE) add_cd_file(TARGET usrmgr DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/cpl/wined3dcfg/CMakeLists.txt b/reactos/dll/cpl/wined3dcfg/CMakeLists.txt index efef5da4148..fc4b6063463 100644 --- a/reactos/dll/cpl/wined3dcfg/CMakeLists.txt +++ b/reactos/dll/cpl/wined3dcfg/CMakeLists.txt @@ -12,13 +12,6 @@ add_library(wined3dcfg SHARED ${CMAKE_CURRENT_BINARY_DIR}/wined3dcfg.def) set_module_type(wined3dcfg cpl UNICODE) - -add_importlibs(wined3dcfg - msvcrt - user32 - comctl32 - advapi32 - kernel32) - +add_importlibs(wined3dcfg user32 comctl32 advapi32 msvcrt kernel32) add_pch(wined3dcfg wined3dcfg.h SOURCE) add_cd_file(TARGET wined3dcfg DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/directx/d3d8thk/CMakeLists.txt b/reactos/dll/directx/d3d8thk/CMakeLists.txt index 0c88e5d2dfe..a17a11544f2 100644 --- a/reactos/dll/directx/d3d8thk/CMakeLists.txt +++ b/reactos/dll/directx/d3d8thk/CMakeLists.txt @@ -1,6 +1,10 @@ spec2def(d3d8thk.dll d3d8thk.spec) -add_library(d3d8thk SHARED d3d8thk.rc ${CMAKE_CURRENT_BINARY_DIR}/d3d8thk.def) + +add_library(d3d8thk SHARED + d3d8thk.rc + ${CMAKE_CURRENT_BINARY_DIR}/d3d8thk.def) + set_entrypoint(d3d8thk 0) add_importlibs(d3d8thk gdi32) add_dependencies(d3d8thk psdk) diff --git a/reactos/dll/directx/ddraw/CMakeLists.txt b/reactos/dll/directx/ddraw/CMakeLists.txt index 1d69eee2381..73518dfe7d8 100644 --- a/reactos/dll/directx/ddraw/CMakeLists.txt +++ b/reactos/dll/directx/ddraw/CMakeLists.txt @@ -2,60 +2,45 @@ spec2def(ddraw.dll ddraw.spec ADD_IMPORTLIB) list(APPEND SOURCE - cleanup.c - main.c - startup.c - Clipper/clipper_main.c - Clipper/clipper_stubs.c - Color/color_stubs.c - d3d/DirectD3D_main.c - Ddraw/callbacks_dd_hel.c - Ddraw/ddraw_displaymode.c - Ddraw/ddraw_main.c - Ddraw/ddraw_setcooperativelevel.c - Ddraw/ddraw_stubs.c - Ddraw/GetCaps.c - Ddraw/GetDeviceIdentifier.c - Gamma/gamma_stubs.c - Kernel/kernel_stubs.c - Palette/createpalette.c - Palette/palette.c - Surface/callbacks_surf_hel.c - Surface/createsurface.c - Surface/surface_main.c - Surface/surface_stubs.c - Videoport/videoport_stubs.c - Vtable/DirectD3D_Vtable.c - Vtable/DirectD3D2_Vtable.c - Vtable/DirectD3D3_Vtable.c - Vtable/DirectD3D7_Vtable.c - Vtable/DirectDraw_Vtable.c - Vtable/DirectDraw2_Vtable.c - Vtable/DirectDraw4_Vtable.c - Vtable/DirectDraw7_Vtable.c - Vtable/DirectDrawSurface_Vtable.c - Vtable/DirectDrawSurface2_Vtable.c - Vtable/DirectDrawSurface3_Vtable.c - Vtable/DirectDrawSurface4_Vtable.c - Vtable/DirectDrawSurface7_Vtable.c -) + cleanup.c + main.c + startup.c + Clipper/clipper_main.c + Clipper/clipper_stubs.c + Color/color_stubs.c + d3d/DirectD3D_main.c + Ddraw/callbacks_dd_hel.c + Ddraw/ddraw_displaymode.c + Ddraw/ddraw_main.c + Ddraw/ddraw_setcooperativelevel.c + Ddraw/ddraw_stubs.c + Ddraw/GetCaps.c + Ddraw/GetDeviceIdentifier.c + Gamma/gamma_stubs.c + Kernel/kernel_stubs.c + Palette/createpalette.c + Palette/palette.c + Surface/callbacks_surf_hel.c + Surface/createsurface.c + Surface/surface_main.c + Surface/surface_stubs.c + Videoport/videoport_stubs.c + Vtable/DirectD3D_Vtable.c + Vtable/DirectD3D2_Vtable.c + Vtable/DirectD3D3_Vtable.c + Vtable/DirectD3D7_Vtable.c + Vtable/DirectDraw_Vtable.c + Vtable/DirectDraw2_Vtable.c + Vtable/DirectDraw4_Vtable.c + Vtable/DirectDraw7_Vtable.c + Vtable/DirectDrawSurface_Vtable.c + Vtable/DirectDrawSurface2_Vtable.c + Vtable/DirectDrawSurface3_Vtable.c + Vtable/DirectDrawSurface4_Vtable.c + Vtable/DirectDrawSurface7_Vtable.c) add_library(ddraw SHARED ${SOURCE}) - set_module_type(ddraw win32dll) - -target_link_libraries(ddraw - uuid - dxguid - ${PSEH_LIB} -) - -add_importlibs(ddraw - advapi32 - gdi32 - user32 - msvcrt - kernel32 - ntdll) - -add_cd_file(TARGET ddraw DESTINATION reactos/system32 FOR all) \ No newline at end of file +target_link_libraries(ddraw uuid dxguid ${PSEH_LIB}) +add_importlibs(ddraw advapi32 gdi32 user32 msvcrt kernel32 ntdll) +add_cd_file(TARGET ddraw DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/directx/ksproxy/CMakeLists.txt b/reactos/dll/directx/ksproxy/CMakeLists.txt index e3ca96fcf58..122623b7707 100644 --- a/reactos/dll/directx/ksproxy/CMakeLists.txt +++ b/reactos/dll/directx/ksproxy/CMakeLists.txt @@ -1,6 +1,5 @@ set_cpp(WITH_STL) - spec2def(ksproxy.ax ksproxy.spec) list(APPEND SOURCE @@ -26,7 +25,6 @@ list(APPEND SOURCE add_library(ksproxy SHARED ${SOURCE} ksproxy.rc) set_module_type(ksproxy win32dll) set_target_properties(ksproxy PROPERTIES SUFFIX ".ax") - target_link_libraries(ksproxy strmiids) add_importlibs(ksproxy advapi32 ole32 setupapi ksuser msvcrt kernel32 ntdll) add_dependencies(ksproxy dxsdk) diff --git a/reactos/dll/directx/ksuser/CMakeLists.txt b/reactos/dll/directx/ksuser/CMakeLists.txt index 50993f759c6..d113df95128 100644 --- a/reactos/dll/directx/ksuser/CMakeLists.txt +++ b/reactos/dll/directx/ksuser/CMakeLists.txt @@ -1,11 +1,12 @@ spec2def(ksuser.dll ksuser.spec ADD_IMPORTLIB) -add_library(ksuser SHARED ksuser.c ksuser.rc ${CMAKE_CURRENT_BINARY_DIR}/ksuser.def) +add_library(ksuser SHARED + ksuser.c + ksuser.rc + ${CMAKE_CURRENT_BINARY_DIR}/ksuser.def) set_module_type(ksuser win32dll) - add_importlibs(ksuser advapi32 msvcrt kernel32 ntdll) -add_dependencies(ksuser psdk bugcodes) +add_dependencies(ksuser bugcodes) add_cd_file(TARGET ksuser DESTINATION reactos/system32 FOR all) - diff --git a/reactos/dll/directx/wine/d3d8/CMakeLists.txt b/reactos/dll/directx/wine/d3d8/CMakeLists.txt index 5e3f47314b5..338fded5772 100644 --- a/reactos/dll/directx/wine/d3d8/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3d8/CMakeLists.txt @@ -4,7 +4,6 @@ add_definitions( -DUSE_WIN32_OPENGL) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(d3d8.dll d3d8.spec) list(APPEND SOURCE diff --git a/reactos/dll/directx/wine/d3d9/CMakeLists.txt b/reactos/dll/directx/wine/d3d9/CMakeLists.txt index 4cc1ad1a34c..23370664a4c 100644 --- a/reactos/dll/directx/wine/d3d9/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3d9/CMakeLists.txt @@ -4,7 +4,6 @@ add_definitions( -DUSE_WIN32_OPENGL) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(d3d9.dll d3d9.spec ADD_IMPORTLIB) list(APPEND SOURCE diff --git a/reactos/dll/directx/wine/d3dcompiler_43/CMakeLists.txt b/reactos/dll/directx/wine/d3dcompiler_43/CMakeLists.txt index 5b3c473cb9c..7578f2fd662 100644 --- a/reactos/dll/directx/wine/d3dcompiler_43/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3dcompiler_43/CMakeLists.txt @@ -4,7 +4,6 @@ add_definitions( -DDIRECT3D_VERSION=0x0900) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(d3dcompiler_43.dll d3dcompiler_43.spec ADD_IMPORTLIB) list(APPEND SOURCE diff --git a/reactos/dll/directx/wine/d3dx9_24/CMakeLists.txt b/reactos/dll/directx/wine/d3dx9_24/CMakeLists.txt index 72ea5481440..e733766dfc2 100644 --- a/reactos/dll/directx/wine/d3dx9_24/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3dx9_24/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(d3dx9_24.dll d3dx9_24.spec) list(APPEND SOURCE diff --git a/reactos/dll/directx/wine/d3dx9_25/CMakeLists.txt b/reactos/dll/directx/wine/d3dx9_25/CMakeLists.txt index 36b42f28e78..ca93608dc33 100644 --- a/reactos/dll/directx/wine/d3dx9_25/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3dx9_25/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(d3dx9_25.dll d3dx9_25.spec) list(APPEND SOURCE diff --git a/reactos/dll/directx/wine/d3dx9_26/CMakeLists.txt b/reactos/dll/directx/wine/d3dx9_26/CMakeLists.txt index ba17b989de7..279e45a3742 100644 --- a/reactos/dll/directx/wine/d3dx9_26/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3dx9_26/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(d3dx9_26.dll d3dx9_26.spec) list(APPEND SOURCE diff --git a/reactos/dll/directx/wine/d3dx9_27/CMakeLists.txt b/reactos/dll/directx/wine/d3dx9_27/CMakeLists.txt index 239cec6d611..849686d541a 100644 --- a/reactos/dll/directx/wine/d3dx9_27/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3dx9_27/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(d3dx9_27.dll d3dx9_27.spec) list(APPEND SOURCE diff --git a/reactos/dll/directx/wine/d3dx9_28/CMakeLists.txt b/reactos/dll/directx/wine/d3dx9_28/CMakeLists.txt index 84f5615804f..3d283680d31 100644 --- a/reactos/dll/directx/wine/d3dx9_28/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3dx9_28/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(d3dx9_28.dll d3dx9_28.spec) list(APPEND SOURCE diff --git a/reactos/dll/directx/wine/d3dx9_29/CMakeLists.txt b/reactos/dll/directx/wine/d3dx9_29/CMakeLists.txt index 9ed14f7eeda..07db5a9d739 100644 --- a/reactos/dll/directx/wine/d3dx9_29/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3dx9_29/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(d3dx9_29.dll d3dx9_29.spec) list(APPEND SOURCE diff --git a/reactos/dll/directx/wine/d3dx9_30/CMakeLists.txt b/reactos/dll/directx/wine/d3dx9_30/CMakeLists.txt index caa2af16bfb..f63010bfbf3 100644 --- a/reactos/dll/directx/wine/d3dx9_30/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3dx9_30/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(d3dx9_30.dll d3dx9_30.spec ADD_IMPORTLIB) list(APPEND SOURCE diff --git a/reactos/dll/directx/wine/d3dx9_31/CMakeLists.txt b/reactos/dll/directx/wine/d3dx9_31/CMakeLists.txt index c693b9fc5ab..2dd3d71f3e9 100644 --- a/reactos/dll/directx/wine/d3dx9_31/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3dx9_31/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(d3dx9_31.dll d3dx9_31.spec) list(APPEND SOURCE diff --git a/reactos/dll/directx/wine/d3dx9_32/CMakeLists.txt b/reactos/dll/directx/wine/d3dx9_32/CMakeLists.txt index e9e35147c34..b77dc548cc1 100644 --- a/reactos/dll/directx/wine/d3dx9_32/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3dx9_32/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(d3dx9_32.dll d3dx9_32.spec) list(APPEND SOURCE diff --git a/reactos/dll/directx/wine/d3dx9_33/CMakeLists.txt b/reactos/dll/directx/wine/d3dx9_33/CMakeLists.txt index 2476260ede7..f8438b3993f 100644 --- a/reactos/dll/directx/wine/d3dx9_33/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3dx9_33/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(d3dx9_33.dll d3dx9_33.spec) list(APPEND SOURCE diff --git a/reactos/dll/directx/wine/d3dx9_34/CMakeLists.txt b/reactos/dll/directx/wine/d3dx9_34/CMakeLists.txt index 049cdcfa2e1..419e4c63029 100644 --- a/reactos/dll/directx/wine/d3dx9_34/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3dx9_34/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(d3dx9_34.dll d3dx9_34.spec) list(APPEND SOURCE diff --git a/reactos/dll/directx/wine/d3dx9_35/CMakeLists.txt b/reactos/dll/directx/wine/d3dx9_35/CMakeLists.txt index b02b02b985b..0447b2528e2 100644 --- a/reactos/dll/directx/wine/d3dx9_35/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3dx9_35/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(d3dx9_35.dll d3dx9_35.spec) list(APPEND SOURCE diff --git a/reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt b/reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt index d366786d560..e4e5a451d6a 100644 --- a/reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(d3dx9_36.dll d3dx9_36.spec ADD_IMPORTLIB) list(APPEND SOURCE diff --git a/reactos/dll/directx/wine/d3dx9_37/CMakeLists.txt b/reactos/dll/directx/wine/d3dx9_37/CMakeLists.txt index 4ba990dd30b..1859f9ab23b 100644 --- a/reactos/dll/directx/wine/d3dx9_37/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3dx9_37/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(d3dx9_37.dll d3dx9_37.spec) list(APPEND SOURCE diff --git a/reactos/dll/directx/wine/d3dx9_38/CMakeLists.txt b/reactos/dll/directx/wine/d3dx9_38/CMakeLists.txt index 8ffd5ade4c1..d71dd06d2aa 100644 --- a/reactos/dll/directx/wine/d3dx9_38/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3dx9_38/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(d3dx9_38.dll d3dx9_38.spec) list(APPEND SOURCE diff --git a/reactos/dll/directx/wine/d3dx9_39/CMakeLists.txt b/reactos/dll/directx/wine/d3dx9_39/CMakeLists.txt index d4775d73bf2..e2e993582ed 100644 --- a/reactos/dll/directx/wine/d3dx9_39/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3dx9_39/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(d3dx9_39.dll d3dx9_39.spec) list(APPEND SOURCE diff --git a/reactos/dll/directx/wine/d3dx9_40/CMakeLists.txt b/reactos/dll/directx/wine/d3dx9_40/CMakeLists.txt index 0e6e4e991ca..c6ed02cf329 100644 --- a/reactos/dll/directx/wine/d3dx9_40/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3dx9_40/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(d3dx9_40.dll d3dx9_40.spec) list(APPEND SOURCE diff --git a/reactos/dll/directx/wine/d3dx9_41/CMakeLists.txt b/reactos/dll/directx/wine/d3dx9_41/CMakeLists.txt index 108e25a7a1f..4a22e8148e2 100644 --- a/reactos/dll/directx/wine/d3dx9_41/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3dx9_41/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(d3dx9_41.dll d3dx9_41.spec) list(APPEND SOURCE diff --git a/reactos/dll/directx/wine/d3dx9_42/CMakeLists.txt b/reactos/dll/directx/wine/d3dx9_42/CMakeLists.txt index 30748e913b8..dffceee6c5f 100644 --- a/reactos/dll/directx/wine/d3dx9_42/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3dx9_42/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(d3dx9_42.dll d3dx9_42.spec) list(APPEND SOURCE diff --git a/reactos/dll/directx/wine/d3dx9_43/CMakeLists.txt b/reactos/dll/directx/wine/d3dx9_43/CMakeLists.txt index 2aa91917d8d..0df66678804 100644 --- a/reactos/dll/directx/wine/d3dx9_43/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3dx9_43/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(d3dx9_43.dll d3dx9_43.spec) list(APPEND SOURCE diff --git a/reactos/dll/directx/wine/d3dxof/CMakeLists.txt b/reactos/dll/directx/wine/d3dxof/CMakeLists.txt index 3219363766a..ac37779b077 100644 --- a/reactos/dll/directx/wine/d3dxof/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3dxof/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(d3dxof.dll d3dxof.spec ADD_IMPORTLIB) list(APPEND SOURCE diff --git a/reactos/dll/directx/wine/dplayx/CMakeLists.txt b/reactos/dll/directx/wine/dplayx/CMakeLists.txt index 8b6ba4a54be..2027631f2c6 100644 --- a/reactos/dll/directx/wine/dplayx/CMakeLists.txt +++ b/reactos/dll/directx/wine/dplayx/CMakeLists.txt @@ -4,7 +4,6 @@ add_definitions( -D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(dplayx.dll dplayx.spec ADD_IMPORTLIB) list(APPEND SOURCE diff --git a/reactos/dll/directx/wine/dsound/CMakeLists.txt b/reactos/dll/directx/wine/dsound/CMakeLists.txt index e660e4e8725..57d718850e6 100644 --- a/reactos/dll/directx/wine/dsound/CMakeLists.txt +++ b/reactos/dll/directx/wine/dsound/CMakeLists.txt @@ -5,7 +5,6 @@ add_definitions( -D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(dsound.dll dsound.spec ADD_IMPORTLIB) add_library(dsound SHARED diff --git a/reactos/dll/directx/wine/dxgi/CMakeLists.txt b/reactos/dll/directx/wine/dxgi/CMakeLists.txt index 53dc609ead9..8054d4fb3cc 100644 --- a/reactos/dll/directx/wine/dxgi/CMakeLists.txt +++ b/reactos/dll/directx/wine/dxgi/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(dxgi.dll dxgi.spec ADD_IMPORTLIB) list(APPEND SOURCE diff --git a/reactos/dll/directx/wine/quartz/CMakeLists.txt b/reactos/dll/directx/wine/quartz/CMakeLists.txt index 50040af12c9..4bfc6e76675 100644 --- a/reactos/dll/directx/wine/quartz/CMakeLists.txt +++ b/reactos/dll/directx/wine/quartz/CMakeLists.txt @@ -42,7 +42,6 @@ add_library(quartz SHARED version.rc) add_idl_headers(quartz_idlheader fil_data.idl) - add_typelib(control_tlb.idl) list(APPEND quartz_rc_deps @@ -51,7 +50,6 @@ list(APPEND quartz_rc_deps ${CMAKE_CURRENT_SOURCE_DIR}/quartz_strmif.rgs) set_source_files_properties(version.rc PROPERTIES OBJECT_DEPENDS "${quartz_rc_deps}") - set_module_type(quartz win32dll) target_link_libraries(quartz strmbase strmiids uuid dxguid wine ${PSEH_LIB}) add_importlibs(quartz dsound msacm32 msvfw32 ole32 oleaut32 shlwapi rpcrt4 user32 gdi32 advapi32 msvcrt kernel32 ntdll) diff --git a/reactos/dll/nls/idndl/CMakeLists.txt b/reactos/dll/nls/idndl/CMakeLists.txt index 322671e1780..590ceec807d 100644 --- a/reactos/dll/nls/idndl/CMakeLists.txt +++ b/reactos/dll/nls/idndl/CMakeLists.txt @@ -15,7 +15,5 @@ if(NOT MSVC) endif() add_importlibs(idndl kernel32) - add_dependencies(idndl psdk) - add_cd_file(TARGET idndl DESTINATION reactos FOR all) diff --git a/reactos/dll/nls/normaliz/CMakeLists.txt b/reactos/dll/nls/normaliz/CMakeLists.txt index 1180cea06df..fcda54b7970 100644 --- a/reactos/dll/nls/normaliz/CMakeLists.txt +++ b/reactos/dll/nls/normaliz/CMakeLists.txt @@ -1,10 +1,6 @@ spec2def(normaliz.dll normaliz.spec) - add_library(normaliz SHARED dummy.c ${CMAKE_CURRENT_BINARY_DIR}/normaliz.def) - set_entrypoint(normaliz 0) - add_importlibs(normaliz kernel32) - add_dependencies(normaliz psdk) diff --git a/reactos/dll/ntdll/CMakeLists.txt b/reactos/dll/ntdll/CMakeLists.txt index e2b14600ddd..982e260f57e 100644 --- a/reactos/dll/ntdll/CMakeLists.txt +++ b/reactos/dll/ntdll/CMakeLists.txt @@ -54,15 +54,7 @@ if(MSVC) add_target_link_flags(ntdll "/RELEASE") endif() -target_link_libraries(ntdll - rtl - ntdllsys - libcntpr - uuid - ${PSEH_LIB}) - +target_link_libraries(ntdll rtl ntdllsys libcntpr uuid ${PSEH_LIB}) add_pch(ntdll include/ntdll.h SOURCE) add_dependencies(ntdll ntstatus asm) - add_cd_file(TARGET ntdll DESTINATION reactos/system32 NO_CAB FOR all) - diff --git a/reactos/dll/opengl/mesa/CMakeLists.txt b/reactos/dll/opengl/mesa/CMakeLists.txt index f2ffd472948..004d505e21b 100644 --- a/reactos/dll/opengl/mesa/CMakeLists.txt +++ b/reactos/dll/opengl/mesa/CMakeLists.txt @@ -23,8 +23,7 @@ if((ARCH STREQUAL "i386") AND (NOT MSVC)) -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM - -DUSE_SSE_ASM - ) + -DUSE_SSE_ASM) add_subdirectory(x86) endif() diff --git a/reactos/dll/opengl/mesa/drivers/common/CMakeLists.txt b/reactos/dll/opengl/mesa/drivers/common/CMakeLists.txt index 2f8695c1888..2037330a389 100644 --- a/reactos/dll/opengl/mesa/drivers/common/CMakeLists.txt +++ b/reactos/dll/opengl/mesa/drivers/common/CMakeLists.txt @@ -1,7 +1,6 @@ list(APPEND SOURCE driverfuncs.c - meta.c -) + meta.c) -add_library(mesa_drv_common STATIC ${SOURCE}) \ No newline at end of file +add_library(mesa_drv_common STATIC ${SOURCE}) diff --git a/reactos/dll/opengl/mesa/main/CMakeLists.txt b/reactos/dll/opengl/mesa/main/CMakeLists.txt index b5218e47ada..c42d9ccdeec 100644 --- a/reactos/dll/opengl/mesa/main/CMakeLists.txt +++ b/reactos/dll/opengl/mesa/main/CMakeLists.txt @@ -71,6 +71,7 @@ list(APPEND SOURCE add_library(mesa_main STATIC ${SOURCE}) add_pch(mesa_main precomp.h SOURCE) + if(NOT MSVC) allow_warnings(mesa_main) add_target_compile_flags(mesa_main "-Wno-type-limits") diff --git a/reactos/dll/opengl/mesa/swrast/CMakeLists.txt b/reactos/dll/opengl/mesa/swrast/CMakeLists.txt index bc78d599e76..18302ce94f6 100644 --- a/reactos/dll/opengl/mesa/swrast/CMakeLists.txt +++ b/reactos/dll/opengl/mesa/swrast/CMakeLists.txt @@ -29,10 +29,8 @@ list(APPEND SOURCE add_library(mesa_swrast STATIC ${SOURCE}) add_pch(mesa_swrast precomp.h SOURCE) -if(NOT MSVC) - allow_warnings(mesa_swrast) -endif() if(NOT MSVC) add_target_compile_flags(mesa_swrast "-Wno-unused-variable") + allow_warnings(mesa_swrast) endif() diff --git a/reactos/dll/opengl/mesa/swrast_setup/CMakeLists.txt b/reactos/dll/opengl/mesa/swrast_setup/CMakeLists.txt index 4eb1d436d82..b488022c6bc 100644 --- a/reactos/dll/opengl/mesa/swrast_setup/CMakeLists.txt +++ b/reactos/dll/opengl/mesa/swrast_setup/CMakeLists.txt @@ -1,7 +1,6 @@ list(APPEND SOURCE ss_context.c - ss_triangle.c -) + ss_triangle.c) -add_library(mesa_swrast_setup STATIC ${SOURCE}) \ No newline at end of file +add_library(mesa_swrast_setup STATIC ${SOURCE}) diff --git a/reactos/dll/opengl/mesa/x86/CMakeLists.txt b/reactos/dll/opengl/mesa/x86/CMakeLists.txt index aaec3098ab7..19d484fb7a1 100644 --- a/reactos/dll/opengl/mesa/x86/CMakeLists.txt +++ b/reactos/dll/opengl/mesa/x86/CMakeLists.txt @@ -4,8 +4,7 @@ list(APPEND SOURCE x86_xform.c 3dnow.c sse.c - rtasm/x86sse.c -) + rtasm/x86sse.c) list(APPEND ASM_SOURCE common_x86_asm.S @@ -24,8 +23,7 @@ list(APPEND ASM_SOURCE sse_xform3.S sse_xform4.S sse_normal.S - read_rgba_span_x86.S -) + read_rgba_span_x86.S) add_asm_files(mesa_x86_asm ${ASM_SOURCE}) add_library(mesa_x86 STATIC ${SOURCE} ${mesa_x86_asm}) diff --git a/reactos/dll/shellext/deskadp/CMakeLists.txt b/reactos/dll/shellext/deskadp/CMakeLists.txt index 99fa79c344f..9d8cda19d02 100644 --- a/reactos/dll/shellext/deskadp/CMakeLists.txt +++ b/reactos/dll/shellext/deskadp/CMakeLists.txt @@ -13,15 +13,6 @@ add_library(deskadp SHARED set_module_type(deskadp win32dll UNICODE) target_link_libraries(deskadp uuid) - -add_importlibs(deskadp - user32 - gdi32 - comctl32 - ole32 - msvcrt - kernel32 - ntdll) - +add_importlibs(deskadp user32 gdi32 comctl32 ole32 msvcrt kernel32 ntdll) add_pch(deskadp precomp.h SOURCE) 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 c6b216f5f5c..8691316c777 100644 --- a/reactos/dll/shellext/deskmon/CMakeLists.txt +++ b/reactos/dll/shellext/deskmon/CMakeLists.txt @@ -13,15 +13,6 @@ add_library(deskmon SHARED set_module_type(deskmon win32dll UNICODE) target_link_libraries(deskmon uuid) - -add_importlibs(deskmon - user32 - gdi32 - comctl32 - ole32 - msvcrt - kernel32 - ntdll) - +add_importlibs(deskmon user32 gdi32 comctl32 ole32 msvcrt kernel32 ntdll) add_pch(deskmon precomp.h SOURCE) 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 263501c19e1..08624da93d3 100644 --- a/reactos/dll/shellext/devcpux/CMakeLists.txt +++ b/reactos/dll/shellext/devcpux/CMakeLists.txt @@ -2,13 +2,5 @@ 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 - user32 - powrprof - comctl32 - msvcrt - kernel32 - ntdll) - +add_importlibs(devcpux user32 powrprof comctl32 msvcrt kernel32 ntdll) add_cd_file(TARGET devcpux DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/shellext/fontext/CMakeLists.txt b/reactos/dll/shellext/fontext/CMakeLists.txt index 78d88d31ce2..a31e78d3e3f 100644 --- a/reactos/dll/shellext/fontext/CMakeLists.txt +++ b/reactos/dll/shellext/fontext/CMakeLists.txt @@ -13,18 +13,6 @@ add_library(fontext SHARED set_module_type(fontext win32dll UNICODE) target_link_libraries(fontext uuid) - -add_importlibs(fontext - user32 - gdi32 - ole32 - shlwapi - lz32 - advapi32 - setupapi - msvcrt - kernel32 - ntdll) - +add_importlibs(fontext user32 gdi32 ole32 shlwapi lz32 advapi32 setupapi msvcrt kernel32 ntdll) add_pch(fontext fontext.h SOURCE) add_cd_file(TARGET fontext DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/shellext/slayer/CMakeLists.txt b/reactos/dll/shellext/slayer/CMakeLists.txt index 825320ddeeb..62d898e229f 100644 --- a/reactos/dll/shellext/slayer/CMakeLists.txt +++ b/reactos/dll/shellext/slayer/CMakeLists.txt @@ -9,15 +9,5 @@ list(APPEND SOURCE add_library(slayer SHARED ${SOURCE}) set_module_type(slayer win32dll UNICODE) target_link_libraries(slayer uuid) - -add_importlibs(slayer - user32 - comctl32 - advapi32 - ole32 - shell32 - msvcrt - kernel32 - ntdll) - +add_importlibs(slayer user32 comctl32 advapi32 ole32 shell32 msvcrt kernel32 ntdll) add_cd_file(TARGET slayer DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/aclui/CMakeLists.txt b/reactos/dll/win32/aclui/CMakeLists.txt index 58f63709afc..de7a6b1c7b9 100644 --- a/reactos/dll/win32/aclui/CMakeLists.txt +++ b/reactos/dll/win32/aclui/CMakeLists.txt @@ -1,6 +1,5 @@ spec2def(aclui.dll aclui.spec) - add_definitions(-DSUPPORT_UXTHEME) list(APPEND SOURCE diff --git a/reactos/dll/win32/actxprxy/CMakeLists.txt b/reactos/dll/win32/actxprxy/CMakeLists.txt index 1f4a6d9a8af..a20d1db4a46 100644 --- a/reactos/dll/win32/actxprxy/CMakeLists.txt +++ b/reactos/dll/win32/actxprxy/CMakeLists.txt @@ -1,9 +1,7 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - add_definitions(-DWINE_REGISTER_DLL -DPROXY_DELEGATION) - spec2def(actxprxy.dll actxprxy.spec) add_rpcproxy_files( diff --git a/reactos/dll/win32/advapi32/CMakeLists.txt b/reactos/dll/win32/advapi32/CMakeLists.txt index 71dc694f739..484f9234914 100644 --- a/reactos/dll/win32/advapi32/CMakeLists.txt +++ b/reactos/dll/win32/advapi32/CMakeLists.txt @@ -1,6 +1,5 @@ spec2def(advapi32.dll advapi32.spec ADD_IMPORTLIB) - add_definitions(-D_ADVAPI32_) remove_definitions(-D_WIN32_WINNT=0x502) @@ -60,8 +59,5 @@ set_module_type(advapi32 win32dll UNICODE ENTRYPOINT DllMain 12) target_link_libraries(advapi32 cryptlib wine ${PSEH_LIB}) add_delay_importlibs(advapi32 secur32) add_importlibs(advapi32 rpcrt4 kernel32 ntdll) - add_pch(advapi32 advapi32.h SOURCE) - add_cd_file(TARGET advapi32 DESTINATION reactos/system32 FOR all) - diff --git a/reactos/dll/win32/advpack/CMakeLists.txt b/reactos/dll/win32/advpack/CMakeLists.txt index c33a9dd7086..6f6f38ba219 100644 --- a/reactos/dll/win32/advpack/CMakeLists.txt +++ b/reactos/dll/win32/advpack/CMakeLists.txt @@ -1,8 +1,6 @@ add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(advpack.dll advpack.spec ADD_IMPORTLIB) list(APPEND SOURCE diff --git a/reactos/dll/win32/atl/CMakeLists.txt b/reactos/dll/win32/atl/CMakeLists.txt index 1a0200f5a44..22efd4f01cd 100644 --- a/reactos/dll/win32/atl/CMakeLists.txt +++ b/reactos/dll/win32/atl/CMakeLists.txt @@ -4,7 +4,6 @@ add_definitions( -D_ATL_VER=_ATL_VER_30) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(atl.dll atl.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -23,7 +22,6 @@ list(APPEND atl_rc_deps ${CMAKE_CURRENT_BINARY_DIR}/atl_lib.tlb) set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS "${atl_rc_deps}") - add_library(atl SHARED ${SOURCE} rsrc.rc) add_typelib(atl_lib.idl) add_dependencies(atl stdole2) diff --git a/reactos/dll/win32/atl100/CMakeLists.txt b/reactos/dll/win32/atl100/CMakeLists.txt index 67dfb1db52f..eedba4fa761 100644 --- a/reactos/dll/win32/atl100/CMakeLists.txt +++ b/reactos/dll/win32/atl100/CMakeLists.txt @@ -4,7 +4,6 @@ add_definitions( -D_ATL_VER=_ATL_VER_100) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(atl100.dll atl100.spec ADD_IMPORTLIB) list(APPEND SOURCE diff --git a/reactos/dll/win32/authz/CMakeLists.txt b/reactos/dll/win32/authz/CMakeLists.txt index 53bc1977118..5d57622d9d7 100644 --- a/reactos/dll/win32/authz/CMakeLists.txt +++ b/reactos/dll/win32/authz/CMakeLists.txt @@ -1,5 +1,4 @@ - spec2def(authz.dll authz.spec) list(APPEND SOURCE @@ -15,8 +14,6 @@ add_library(authz SHARED ${CMAKE_CURRENT_BINARY_DIR}/authz.def) set_module_type(authz win32dll UNICODE) - add_importlibs(authz advapi32 msvcrt kernel32 ntdll) add_pch(authz precomp.h SOURCE) - add_cd_file(TARGET authz DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/avicap32/CMakeLists.txt b/reactos/dll/win32/avicap32/CMakeLists.txt index 85f843dd21d..7c574f5a94b 100644 --- a/reactos/dll/win32/avicap32/CMakeLists.txt +++ b/reactos/dll/win32/avicap32/CMakeLists.txt @@ -1,17 +1,12 @@ spec2def(avicap32.dll avicap32.spec ADD_IMPORTLIB) - add_library(avicap32 SHARED avicap32.c avicap32.rc ${CMAKE_CURRENT_BINARY_DIR}/avicap32.def) set_module_type(avicap32 win32dll UNICODE) - target_link_libraries(avicap32 wine) - add_importlibs(avicap32 advapi32 user32 version msvcrt kernel32 ntdll) - add_cd_file(TARGET avicap32 DESTINATION reactos/system32 FOR all) - diff --git a/reactos/dll/win32/beepmidi/CMakeLists.txt b/reactos/dll/win32/beepmidi/CMakeLists.txt index fac6040b173..18f8ba4f130 100644 --- a/reactos/dll/win32/beepmidi/CMakeLists.txt +++ b/reactos/dll/win32/beepmidi/CMakeLists.txt @@ -12,9 +12,5 @@ if(CMAKE_C_COMPILER_ID STREQUAL "Clang") endif() set_module_type(beepmidi win32dll UNICODE) - add_importlibs(beepmidi winmm msvcrt kernel32 ntdll) - - -add_dependencies(beepmidi psdk) add_cd_file(TARGET beepmidi DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/browseui/CMakeLists.txt b/reactos/dll/win32/browseui/CMakeLists.txt index 2c1e04c067c..92cc0dcd0bf 100644 --- a/reactos/dll/win32/browseui/CMakeLists.txt +++ b/reactos/dll/win32/browseui/CMakeLists.txt @@ -5,7 +5,6 @@ remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) include_directories(${REACTOS_SOURCE_DIR}/lib/atl) - spec2def(browseui.dll browseui.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -37,25 +36,8 @@ add_library(browseui SHARED ${CMAKE_CURRENT_BINARY_DIR}/browseui.def) set_module_type(browseui win32dll UNICODE) - -target_link_libraries(browseui - atlnew - uuid - wine) - -add_importlibs(browseui - shlwapi - shell32 - comctl32 - gdi32 - ole32 - oleaut32 - user32 - advapi32 - msvcrt - kernel32 - ntdll) - +target_link_libraries(browseui atlnew uuid wine) +add_importlibs(browseui shlwapi shell32 comctl32 gdi32 ole32 oleaut32 user32 advapi32 msvcrt kernel32 ntdll) add_pch(browseui precomp.h SOURCE) add_cd_file(TARGET browseui DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/cfgmgr32/CMakeLists.txt b/reactos/dll/win32/cfgmgr32/CMakeLists.txt index 16d1d92f06c..2e630932e67 100644 --- a/reactos/dll/win32/cfgmgr32/CMakeLists.txt +++ b/reactos/dll/win32/cfgmgr32/CMakeLists.txt @@ -9,6 +9,5 @@ list(APPEND SOURCE add_library(cfgmgr32 SHARED ${SOURCE}) set_module_type(cfgmgr32 win32dll) -add_importlibs(cfgmgr32 msvcrt setupapi kernel32 ntdll) -add_dependencies(cfgmgr32 psdk) +add_importlibs(cfgmgr32 setupapi msvcrt kernel32 ntdll) add_cd_file(TARGET cfgmgr32 DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/comcat/CMakeLists.txt b/reactos/dll/win32/comcat/CMakeLists.txt index dcc2fde4689..ab1d9f5a9f9 100644 --- a/reactos/dll/win32/comcat/CMakeLists.txt +++ b/reactos/dll/win32/comcat/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(comcat.dll comcat.spec) list(APPEND SOURCE diff --git a/reactos/dll/win32/compstui/CMakeLists.txt b/reactos/dll/win32/compstui/CMakeLists.txt index f9091be2dfb..bac88d4722a 100644 --- a/reactos/dll/win32/compstui/CMakeLists.txt +++ b/reactos/dll/win32/compstui/CMakeLists.txt @@ -1,8 +1,6 @@ add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(compstui.dll compstui.spec) list(APPEND SOURCE @@ -10,11 +8,7 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/compstui.def) add_library(compstui SHARED ${SOURCE}) - set_module_type(compstui win32dll) - target_link_libraries(compstui wine) - add_importlibs(compstui msvcrt kernel32 ntdll) add_cd_file(TARGET compstui DESTINATION reactos/system32 FOR all) - diff --git a/reactos/dll/win32/credui/CMakeLists.txt b/reactos/dll/win32/credui/CMakeLists.txt index 8030241a68d..3d9fe221e59 100644 --- a/reactos/dll/win32/credui/CMakeLists.txt +++ b/reactos/dll/win32/credui/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(credui.dll credui.spec ADD_IMPORTLIB) list(APPEND SOURCE diff --git a/reactos/dll/win32/crtdll/CMakeLists.txt b/reactos/dll/win32/crtdll/CMakeLists.txt index fc8b6483bb6..71d108f4e3e 100644 --- a/reactos/dll/win32/crtdll/CMakeLists.txt +++ b/reactos/dll/win32/crtdll/CMakeLists.txt @@ -18,9 +18,7 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/crtdll.def) add_library(crtdll SHARED ${SOURCE}) - set_module_type(crtdll win32dll ENTRYPOINT DllMain 12) - target_link_libraries(crtdll crt wine) if(MSVC) @@ -29,5 +27,4 @@ if(MSVC) endif() add_importlibs(crtdll kernel32 ntdll) - add_cd_file(TARGET crtdll DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/cryptdlg/CMakeLists.txt b/reactos/dll/win32/cryptdlg/CMakeLists.txt index 09f53cdf064..e389c39e3b8 100644 --- a/reactos/dll/win32/cryptdlg/CMakeLists.txt +++ b/reactos/dll/win32/cryptdlg/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(cryptdlg.dll cryptdlg.spec) list(APPEND SOURCE diff --git a/reactos/dll/win32/cryptdll/CMakeLists.txt b/reactos/dll/win32/cryptdll/CMakeLists.txt index 1810479e81a..05bea5e87d8 100644 --- a/reactos/dll/win32/cryptdll/CMakeLists.txt +++ b/reactos/dll/win32/cryptdll/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(cryptdll.dll cryptdll.spec) list(APPEND SOURCE diff --git a/reactos/dll/win32/cryptnet/CMakeLists.txt b/reactos/dll/win32/cryptnet/CMakeLists.txt index ffbdf1a3098..7e8aa2d7c02 100644 --- a/reactos/dll/win32/cryptnet/CMakeLists.txt +++ b/reactos/dll/win32/cryptnet/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(cryptnet.dll cryptnet.spec ADD_IMPORTLIB) list(APPEND SOURCE diff --git a/reactos/dll/win32/cryptui/CMakeLists.txt b/reactos/dll/win32/cryptui/CMakeLists.txt index 29262b8fad6..ed6c53810df 100644 --- a/reactos/dll/win32/cryptui/CMakeLists.txt +++ b/reactos/dll/win32/cryptui/CMakeLists.txt @@ -4,7 +4,6 @@ add_definitions( -D_WINE) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(cryptui.dll cryptui.spec ADD_IMPORTLIB) list(APPEND SOURCE diff --git a/reactos/dll/win32/devmgr/CMakeLists.txt b/reactos/dll/win32/devmgr/CMakeLists.txt index d2c78a1207e..179e0ce4343 100644 --- a/reactos/dll/win32/devmgr/CMakeLists.txt +++ b/reactos/dll/win32/devmgr/CMakeLists.txt @@ -18,16 +18,6 @@ add_library(devmgr SHARED set_module_type(devmgr win32dll UNICODE) target_link_libraries(devmgr uuid wine) - -add_importlibs(devmgr - setupapi - advapi32 - newdev - user32 - version - msvcrt - kernel32 - ntdll) - +add_importlibs(devmgr setupapi advapi32 newdev user32 version msvcrt kernel32 ntdll) add_pch(devmgr precomp.h SOURCE) add_cd_file(TARGET devmgr DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/dhcpcsvc/CMakeLists.txt b/reactos/dll/win32/dhcpcsvc/CMakeLists.txt index cf585a90cda..517582e5584 100644 --- a/reactos/dll/win32/dhcpcsvc/CMakeLists.txt +++ b/reactos/dll/win32/dhcpcsvc/CMakeLists.txt @@ -1,8 +1,6 @@ add_definitions(-Dtzset=_tzset) - include_directories(include) - spec2def(dhcpcsvc.dll dhcpcsvc.spec ADD_IMPORTLIB) list(APPEND SOURCE diff --git a/reactos/dll/win32/dnsapi/CMakeLists.txt b/reactos/dll/win32/dnsapi/CMakeLists.txt index 0755c23a5f6..7a80b3c1ea2 100644 --- a/reactos/dll/win32/dnsapi/CMakeLists.txt +++ b/reactos/dll/win32/dnsapi/CMakeLists.txt @@ -5,7 +5,6 @@ include_directories( ${REACTOS_SOURCE_DIR}/lib/3rdparty/adns/adns_win32) add_definitions(-DADNS_JGAA_WIN32) - spec2def(dnsapi.dll dnsapi.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -27,6 +26,4 @@ set_module_type(dnsapi win32dll) target_link_libraries(dnsapi adns) add_importlibs(dnsapi user32 ws2_32 iphlpapi msvcrt kernel32 ntdll) add_pch(dnsapi dnsapi/precomp.h SOURCE) -add_dependencies(dnsapi psdk) add_cd_file(TARGET dnsapi DESTINATION reactos/system32 FOR all) - diff --git a/reactos/dll/win32/dwmapi/CMakeLists.txt b/reactos/dll/win32/dwmapi/CMakeLists.txt index b9eb8806de9..da4c1cc50d2 100644 --- a/reactos/dll/win32/dwmapi/CMakeLists.txt +++ b/reactos/dll/win32/dwmapi/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(dwmapi.dll dwmapi.spec) list(APPEND SOURCE diff --git a/reactos/dll/win32/fmifs/CMakeLists.txt b/reactos/dll/win32/fmifs/CMakeLists.txt index ffc3d847466..13a61eb37d2 100644 --- a/reactos/dll/win32/fmifs/CMakeLists.txt +++ b/reactos/dll/win32/fmifs/CMakeLists.txt @@ -23,4 +23,3 @@ add_importlibs(fmifs kernel32 ntdll) add_pch(fmifs precomp.h SOURCE) add_dependencies(fmifs psdk) add_cd_file(TARGET fmifs DESTINATION reactos/system32 FOR all) - diff --git a/reactos/dll/win32/framedyn/CMakeLists.txt b/reactos/dll/win32/framedyn/CMakeLists.txt index 9a2f8b8fd3b..5156254f425 100644 --- a/reactos/dll/win32/framedyn/CMakeLists.txt +++ b/reactos/dll/win32/framedyn/CMakeLists.txt @@ -1,6 +1,5 @@ set_cpp(WITH_RUNTIME WITH_EXCEPTIONS) - spec2def(framedyn.dll framedyn.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -15,7 +14,6 @@ endif() add_library(framedyn SHARED ${SOURCE}) set_module_type(framedyn win32dll UNICODE) add_importlibs(framedyn oleaut32 msvcrt kernel32 ntdll) - add_cd_file(TARGET framedyn DESTINATION reactos/system32/wbem FOR all) if(NOT MSVC) diff --git a/reactos/dll/win32/fusion/CMakeLists.txt b/reactos/dll/win32/fusion/CMakeLists.txt index 6704f9597f6..3a70195197c 100644 --- a/reactos/dll/win32/fusion/CMakeLists.txt +++ b/reactos/dll/win32/fusion/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(fusion.dll fusion.spec) list(APPEND SOURCE diff --git a/reactos/dll/win32/gdiplus/CMakeLists.txt b/reactos/dll/win32/gdiplus/CMakeLists.txt index d8f69adb96d..2217df50343 100644 --- a/reactos/dll/win32/gdiplus/CMakeLists.txt +++ b/reactos/dll/win32/gdiplus/CMakeLists.txt @@ -4,7 +4,6 @@ add_definitions( -D_USE_MATH_DEFINES) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(gdiplus.dll gdiplus.spec ADD_IMPORTLIB) list(APPEND SOURCE diff --git a/reactos/dll/win32/getuname/CMakeLists.txt b/reactos/dll/win32/getuname/CMakeLists.txt index f6c0cfc3fae..bb31454f875 100644 --- a/reactos/dll/win32/getuname/CMakeLists.txt +++ b/reactos/dll/win32/getuname/CMakeLists.txt @@ -1,7 +1,5 @@ - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(getuname.dll getuname.spec) add_library(getuname SHARED @@ -9,7 +7,6 @@ add_library(getuname SHARED getuname.rc ${CMAKE_CURRENT_BINARY_DIR}/getuname.def) - set_module_type(getuname win32dll UNICODE) add_importlibs(getuname user32 msvcrt kernel32 ntdll) add_cd_file(TARGET getuname DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/hhctrl.ocx/CMakeLists.txt b/reactos/dll/win32/hhctrl.ocx/CMakeLists.txt index 2e967c9721f..8d199af3043 100644 --- a/reactos/dll/win32/hhctrl.ocx/CMakeLists.txt +++ b/reactos/dll/win32/hhctrl.ocx/CMakeLists.txt @@ -30,13 +30,9 @@ list(APPEND hhctrl_rc_deps ${CMAKE_CURRENT_BINARY_DIR}/hhctrl_tlb.tlb) set_source_files_properties(hhctrl.rc PROPERTIES OBJECT_DEPENDS "${hhctrl_rc_deps}") - -# hhctrl_tlb.tlb needs stdole2.tlb -add_dependencies(hhctrl stdole2) - set_module_type(hhctrl win32ocx) target_link_libraries(hhctrl uuid wine) add_importlibs(hhctrl advapi32 comctl32 shlwapi ole32 oleaut32 user32 gdi32 msvcrt kernel32 ntdll) -add_dependencies(hhctrl wineheaders) +add_dependencies(hhctrl stdole2 wineheaders) add_pch(hhctrl hhctrl.h SOURCE) add_cd_file(TARGET hhctrl DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/hid/CMakeLists.txt b/reactos/dll/win32/hid/CMakeLists.txt index 42147d368e1..e045cfe4460 100644 --- a/reactos/dll/win32/hid/CMakeLists.txt +++ b/reactos/dll/win32/hid/CMakeLists.txt @@ -1,5 +1,4 @@ - list(APPEND SOURCE hid.c stubs.c @@ -13,7 +12,6 @@ add_library(hid SHARED ${CMAKE_CURRENT_BINARY_DIR}/hid.def) set_module_type(hid win32dll UNICODE) - add_importlibs(hid msvcrt kernel32 ntdll) add_pch(hid precomp.h SOURCE) add_cd_file(TARGET hid DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/hlink/CMakeLists.txt b/reactos/dll/win32/hlink/CMakeLists.txt index 8e6b85d7151..8bc7378dfef 100644 --- a/reactos/dll/win32/hlink/CMakeLists.txt +++ b/reactos/dll/win32/hlink/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(hlink.dll hlink.spec ADD_IMPORTLIB) list(APPEND SOURCE diff --git a/reactos/dll/win32/ieframe/CMakeLists.txt b/reactos/dll/win32/ieframe/CMakeLists.txt index 562c38dba64..09efbb8fabd 100644 --- a/reactos/dll/win32/ieframe/CMakeLists.txt +++ b/reactos/dll/win32/ieframe/CMakeLists.txt @@ -1,7 +1,6 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) - spec2def(ieframe.dll ieframe.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -39,10 +38,7 @@ list(APPEND ieframe_rc_deps ${CMAKE_CURRENT_BINARY_DIR}/ieframe_v1.tlb) set_source_files_properties(ieframe.rc PROPERTIES OBJECT_DEPENDS "${ieframe_rc_deps}") - -# ieframe_v1.tlb needs stdole2.tlb add_dependencies(ieframe stdole2) - set_module_type(ieframe win32dll) target_link_libraries(ieframe uuid wine) add_importlibs(ieframe urlmon shell32 comctl32 shlwapi oleaut32 ole32 user32 gdi32 advapi32 msvcrt kernel32 ntdll) diff --git a/reactos/dll/win32/imaadp32.acm/CMakeLists.txt b/reactos/dll/win32/imaadp32.acm/CMakeLists.txt index fd2d4004e5a..fddf9b12afd 100644 --- a/reactos/dll/win32/imaadp32.acm/CMakeLists.txt +++ b/reactos/dll/win32/imaadp32.acm/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(imaadp32.acm imaadp32.acm.spec) list(APPEND SOURCE diff --git a/reactos/dll/win32/imagehlp/CMakeLists.txt b/reactos/dll/win32/imagehlp/CMakeLists.txt index 4195057c091..7a79c8bb2e0 100644 --- a/reactos/dll/win32/imagehlp/CMakeLists.txt +++ b/reactos/dll/win32/imagehlp/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D_IMAGEHLP_SOURCE_) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(imagehlp.dll imagehlp.spec ADD_IMPORTLIB) list(APPEND SOURCE diff --git a/reactos/dll/win32/inetmib1/CMakeLists.txt b/reactos/dll/win32/inetmib1/CMakeLists.txt index 8764effe22d..d5b0bb713e2 100644 --- a/reactos/dll/win32/inetmib1/CMakeLists.txt +++ b/reactos/dll/win32/inetmib1/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(inetmib1.dll inetmib1.spec) list(APPEND SOURCE diff --git a/reactos/dll/win32/initpki/CMakeLists.txt b/reactos/dll/win32/initpki/CMakeLists.txt index 8d103379b39..fe5d2724613 100644 --- a/reactos/dll/win32/initpki/CMakeLists.txt +++ b/reactos/dll/win32/initpki/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(initpki.dll initpki.spec) list(APPEND SOURCE diff --git a/reactos/dll/win32/iologmsg/CMakeLists.txt b/reactos/dll/win32/iologmsg/CMakeLists.txt index b3583606c94..02197c45d05 100644 --- a/reactos/dll/win32/iologmsg/CMakeLists.txt +++ b/reactos/dll/win32/iologmsg/CMakeLists.txt @@ -1,3 +1,4 @@ + include_directories(${REACTOS_BINARY_DIR}/include/reactos) add_library(iologmsg SHARED iologmsg.rc) set_module_type(iologmsg win32dll ENTRYPOINT 0 UNICODE) diff --git a/reactos/dll/win32/iphlpapi/CMakeLists.txt b/reactos/dll/win32/iphlpapi/CMakeLists.txt index 3d15eb6aded..8fd8f48a139 100644 --- a/reactos/dll/win32/iphlpapi/CMakeLists.txt +++ b/reactos/dll/win32/iphlpapi/CMakeLists.txt @@ -1,5 +1,4 @@ - include_directories( ${REACTOS_SOURCE_DIR}/include/reactos/wine ${REACTOS_SOURCE_DIR}/dll/win32/dhcpcsvc/include @@ -29,4 +28,3 @@ target_link_libraries(iphlpapi wine tdilib) add_importlibs(iphlpapi icmp dhcpcsvc advapi32 ws2_32 msvcrt kernel32 ntdll) add_pch(iphlpapi iphlpapi_private.h SOURCE) add_cd_file(TARGET iphlpapi DESTINATION reactos/system32 FOR all) - diff --git a/reactos/dll/win32/itircl/CMakeLists.txt b/reactos/dll/win32/itircl/CMakeLists.txt index 944be95cf89..dc5a2fef1e1 100644 --- a/reactos/dll/win32/itircl/CMakeLists.txt +++ b/reactos/dll/win32/itircl/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(itircl.dll itircl.spec) list(APPEND SOURCE diff --git a/reactos/dll/win32/itss/CMakeLists.txt b/reactos/dll/win32/itss/CMakeLists.txt index 5d1e100856c..534a3fe510b 100644 --- a/reactos/dll/win32/itss/CMakeLists.txt +++ b/reactos/dll/win32/itss/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(itss.dll itss.spec) list(APPEND SOURCE diff --git a/reactos/dll/win32/jscript/CMakeLists.txt b/reactos/dll/win32/jscript/CMakeLists.txt index 6cb5c1d7bea..88074750c9f 100644 --- a/reactos/dll/win32/jscript/CMakeLists.txt +++ b/reactos/dll/win32/jscript/CMakeLists.txt @@ -48,7 +48,7 @@ add_library(jscript SHARED add_idl_headers(jscript_idlheader jscript_classes.idl) add_typelib(jsglobal.idl) -add_dependencies(jscript jscript_idlheader stdole2) # jsglobal.tlb needs stdole2.tlb +add_dependencies(jscript jscript_idlheader stdole2) set_module_type(jscript win32dll) target_link_libraries(jscript uuid wine) add_importlibs(jscript user32 ole32 oleaut32 advapi32 msvcrt kernel32 ntdll) diff --git a/reactos/dll/win32/jsproxy/CMakeLists.txt b/reactos/dll/win32/jsproxy/CMakeLists.txt index 4f7c63f3d2e..29879009653 100644 --- a/reactos/dll/win32/jsproxy/CMakeLists.txt +++ b/reactos/dll/win32/jsproxy/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(jsproxy.dll jsproxy.spec ADD_IMPORTLIB) list(APPEND SOURCE diff --git a/reactos/dll/win32/kernel32_vista/CMakeLists.txt b/reactos/dll/win32/kernel32_vista/CMakeLists.txt index 30d7710b715..67835dbcdd3 100644 --- a/reactos/dll/win32/kernel32_vista/CMakeLists.txt +++ b/reactos/dll/win32/kernel32_vista/CMakeLists.txt @@ -1,9 +1,8 @@ -add_definitions(-D_KERNEL32_) - remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) +add_definitions(-D_KERNEL32_) spec2def(kernel32_vista.dll kernel32_vista.spec ADD_IMPORTLIB) list(APPEND SOURCE diff --git a/reactos/dll/win32/lpk/CMakeLists.txt b/reactos/dll/win32/lpk/CMakeLists.txt index 1374941f3c6..4bd68b34863 100644 --- a/reactos/dll/win32/lpk/CMakeLists.txt +++ b/reactos/dll/win32/lpk/CMakeLists.txt @@ -1,8 +1,6 @@ - add_definitions(-DLANGPACK) include_directories(include) - spec2def(lpk.dll lpk.spec) list(APPEND SOURCE @@ -16,8 +14,6 @@ add_library(lpk SHARED ${CMAKE_CURRENT_BINARY_DIR}/lpk.def) set_module_type(lpk win32dll UNICODE) - - add_importlibs(lpk user32 usp10 msvcrt kernel32 ntdll) add_pch(lpk ros_lpk.h SOURCE) add_cd_file(TARGET lpk DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/lsasrv/CMakeLists.txt b/reactos/dll/win32/lsasrv/CMakeLists.txt index 523841c7253..ec463c8af56 100644 --- a/reactos/dll/win32/lsasrv/CMakeLists.txt +++ b/reactos/dll/win32/lsasrv/CMakeLists.txt @@ -33,5 +33,4 @@ set_module_type(lsasrv win32dll UNICODE) target_link_libraries(lsasrv wine ${PSEH_LIB}) add_importlibs(lsasrv samsrv rpcrt4 msvcrt kernel32 advapi32 ntdll) add_pch(lsasrv lsasrv.h SOURCE) -add_dependencies(lsasrv psdk) add_cd_file(TARGET lsasrv DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/lz32/CMakeLists.txt b/reactos/dll/win32/lz32/CMakeLists.txt index 8c19456b892..d75d8d96a67 100644 --- a/reactos/dll/win32/lz32/CMakeLists.txt +++ b/reactos/dll/win32/lz32/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(lz32.dll lz32.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -9,11 +8,8 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/lz32.def) add_library(lz32 SHARED ${SOURCE}) - set_module_type(lz32 win32dll ENTRYPOINT 0 ) target_link_libraries(lz32 wine) - add_importlibs(lz32 kernel32 ntdll) add_dependencies(lz32 psdk) add_cd_file(TARGET lz32 DESTINATION reactos/system32 FOR all) - diff --git a/reactos/dll/win32/mciavi32/CMakeLists.txt b/reactos/dll/win32/mciavi32/CMakeLists.txt index 434f56c2677..0bafe1e9e09 100644 --- a/reactos/dll/win32/mciavi32/CMakeLists.txt +++ b/reactos/dll/win32/mciavi32/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(mciavi32.dll mciavi32.spec) list(APPEND SOURCE diff --git a/reactos/dll/win32/mcicda/CMakeLists.txt b/reactos/dll/win32/mcicda/CMakeLists.txt index 23a1f5a0672..1bd908491c3 100644 --- a/reactos/dll/win32/mcicda/CMakeLists.txt +++ b/reactos/dll/win32/mcicda/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(mcicda.dll mcicda.spec) list(APPEND SOURCE @@ -9,9 +8,7 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/mcicda.def) add_library(mcicda SHARED ${SOURCE}) - set_module_type(mcicda win32dll) target_link_libraries(mcicda wine) -add_importlibs(mcicda msvcrt winmm user32 kernel32 ntdll) -add_dependencies(mcicda psdk) +add_importlibs(mcicda winmm user32 msvcrt kernel32 ntdll) add_cd_file(TARGET mcicda DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/mciqtz32/CMakeLists.txt b/reactos/dll/win32/mciqtz32/CMakeLists.txt index ad0628f4feb..536681e2712 100644 --- a/reactos/dll/win32/mciqtz32/CMakeLists.txt +++ b/reactos/dll/win32/mciqtz32/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(mciqtz32.dll mciqtz32.spec) list(APPEND SOURCE diff --git a/reactos/dll/win32/mciseq/CMakeLists.txt b/reactos/dll/win32/mciseq/CMakeLists.txt index c9cf715b6d6..8b40837941a 100644 --- a/reactos/dll/win32/mciseq/CMakeLists.txt +++ b/reactos/dll/win32/mciseq/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(mciseq.dll mciseq.spec) list(APPEND SOURCE diff --git a/reactos/dll/win32/mciwave/CMakeLists.txt b/reactos/dll/win32/mciwave/CMakeLists.txt index bb7c3e13389..c11ee1db9a5 100644 --- a/reactos/dll/win32/mciwave/CMakeLists.txt +++ b/reactos/dll/win32/mciwave/CMakeLists.txt @@ -4,7 +4,6 @@ add_definitions( -D_WINE) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(mciwave.dll mciwave.spec) list(APPEND SOURCE @@ -12,12 +11,9 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/mciwave.def) add_library(mciwave SHARED ${SOURCE}) - set_module_type(mciwave win32dll) - target_link_libraries(mciwave wine) add_importlibs(mciwave user32 winmm msvcrt kernel32 ntdll) -add_dependencies(mciwave psdk) add_cd_file(TARGET mciwave DESTINATION reactos/system32 FOR all) if(NOT MSVC) diff --git a/reactos/dll/win32/mgmtapi/CMakeLists.txt b/reactos/dll/win32/mgmtapi/CMakeLists.txt index a7a5472893a..4579e33b53b 100644 --- a/reactos/dll/win32/mgmtapi/CMakeLists.txt +++ b/reactos/dll/win32/mgmtapi/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(mgmtapi.dll mgmtapi.spec) list(APPEND SOURCE diff --git a/reactos/dll/win32/mmdrv/CMakeLists.txt b/reactos/dll/win32/mmdrv/CMakeLists.txt index 8a4a500a306..fa6f6ce17f3 100644 --- a/reactos/dll/win32/mmdrv/CMakeLists.txt +++ b/reactos/dll/win32/mmdrv/CMakeLists.txt @@ -1,6 +1,4 @@ - - spec2def(mmdrv.dll mmdrv.spec) list(APPEND SOURCE @@ -18,8 +16,6 @@ add_library(mmdrv SHARED ${CMAKE_CURRENT_BINARY_DIR}/mmdrv.def) set_module_type(mmdrv win32dll UNICODE) - -add_importlibs(mmdrv msvcrt winmm user32 kernel32 ntdll) -add_dependencies(mmdrv psdk) +add_importlibs(mmdrv winmm user32 msvcrt kernel32 ntdll) add_pch(mmdrv mmdrv.h SOURCE) add_cd_file(TARGET mmdrv DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/mprapi/CMakeLists.txt b/reactos/dll/win32/mprapi/CMakeLists.txt index 95c08f67074..55ecce7f89b 100644 --- a/reactos/dll/win32/mprapi/CMakeLists.txt +++ b/reactos/dll/win32/mprapi/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(mprapi.dll mprapi.spec) list(APPEND SOURCE @@ -10,7 +9,6 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/mprapi.def) add_library(mprapi SHARED ${SOURCE}) - set_module_type(mprapi win32dll) target_link_libraries(mprapi wine) add_importlibs(mprapi msvcrt kernel32 ntdll) diff --git a/reactos/dll/win32/msadp32.acm/CMakeLists.txt b/reactos/dll/win32/msadp32.acm/CMakeLists.txt index 702cefdc0e7..60132a73f7e 100644 --- a/reactos/dll/win32/msadp32.acm/CMakeLists.txt +++ b/reactos/dll/win32/msadp32.acm/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(msadp32.acm msadp32.acm.spec) list(APPEND SOURCE diff --git a/reactos/dll/win32/msafd/CMakeLists.txt b/reactos/dll/win32/msafd/CMakeLists.txt index 1be60b0851e..30e265a7f54 100644 --- a/reactos/dll/win32/msafd/CMakeLists.txt +++ b/reactos/dll/win32/msafd/CMakeLists.txt @@ -1,5 +1,4 @@ - include_directories( BEFORE include ${REACTOS_SOURCE_DIR}/include/reactos/drivers) @@ -20,7 +19,6 @@ add_library(msafd SHARED ${CMAKE_CURRENT_BINARY_DIR}/msafd.def) set_module_type(msafd win32dll UNICODE) - add_importlibs(msafd advapi32 msvcrt kernel32 ntdll) add_pch(msafd msafd.h SOURCE) add_cd_file(TARGET msafd DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/mscms/CMakeLists.txt b/reactos/dll/win32/mscms/CMakeLists.txt index 017e857f363..1e7bfd2df9b 100644 --- a/reactos/dll/win32/mscms/CMakeLists.txt +++ b/reactos/dll/win32/mscms/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(mscms.dll mscms.spec) list(APPEND SOURCE diff --git a/reactos/dll/win32/mscoree/CMakeLists.txt b/reactos/dll/win32/mscoree/CMakeLists.txt index e2ec45bffae..7c945218f40 100644 --- a/reactos/dll/win32/mscoree/CMakeLists.txt +++ b/reactos/dll/win32/mscoree/CMakeLists.txt @@ -1,10 +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) +add_definitions(-D__WINESRC__) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(mscoree.dll mscoree.spec) list(APPEND SOURCE diff --git a/reactos/dll/win32/mshtml.tlb/CMakeLists.txt b/reactos/dll/win32/mshtml.tlb/CMakeLists.txt index 04ae9dedfd0..84363893122 100644 --- a/reactos/dll/win32/mshtml.tlb/CMakeLists.txt +++ b/reactos/dll/win32/mshtml.tlb/CMakeLists.txt @@ -1,10 +1,7 @@ add_typelib(mshtml_tlb.idl) - add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - add_library(mshtml.tlb SHARED rsrc.rc) list(APPEND mshtml_tlb_rc_deps @@ -12,7 +9,6 @@ list(APPEND mshtml_tlb_rc_deps ${CMAKE_CURRENT_SOURCE_DIR}/mshtml_tlb.rgs) set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS "${mshtml_tlb_rc_deps}") - set_module_type(mshtml.tlb module) set_target_properties(mshtml.tlb PROPERTIES SUFFIX "") add_dependencies(mshtml.tlb stdole2) diff --git a/reactos/dll/win32/mshtml/CMakeLists.txt b/reactos/dll/win32/mshtml/CMakeLists.txt index 4fea5a1aaf0..00d42539795 100644 --- a/reactos/dll/win32/mshtml/CMakeLists.txt +++ b/reactos/dll/win32/mshtml/CMakeLists.txt @@ -103,7 +103,6 @@ list(APPEND mshtml_rc_deps ${CMAKE_CURRENT_SOURCE_DIR}/mshtml_classes.rgs) set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS "${mshtml_rc_deps}") - set_module_type(mshtml win32dll) target_link_libraries(mshtml uuid wine strmiids oldnames) diff --git a/reactos/dll/win32/msi/CMakeLists.txt b/reactos/dll/win32/msi/CMakeLists.txt index a8316ca23ff..3e5247790f2 100644 --- a/reactos/dll/win32/msi/CMakeLists.txt +++ b/reactos/dll/win32/msi/CMakeLists.txt @@ -1,12 +1,10 @@ -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -add_definitions(-D__WINESRC__ -DMSIRUNMODE=MSIRUNMODE_T) - remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +add_definitions(-D__WINESRC__ -DMSIRUNMODE=MSIRUNMODE_T) spec2def(msi.dll msi.spec ADD_IMPORTLIB) - generate_idl_iids(msiserver.idl) list(APPEND SOURCE @@ -67,20 +65,8 @@ set_module_type(msi win32dll) target_link_libraries(msi uuid ${PSEH_LIB} wine) add_dependencies(msi msi_idlheader) add_delay_importlibs(msi odbccp32 crypt32 wintrust) -add_importlibs(msi - advapi32 - cabinet - comctl32 - gdi32 - ole32 - oleaut32 - shell32 - shlwapi - urlmon - user32 - version - wininet -#fixme : should be in delayed imports +add_importlibs(msi advapi32 cabinet comctl32 gdi32 ole32 oleaut32 shell32 shlwapi urlmon user32 version wininet + #FIXME : should be in delayed imports imagehlp msvcrt kernel32_vista diff --git a/reactos/dll/win32/msimg32/CMakeLists.txt b/reactos/dll/win32/msimg32/CMakeLists.txt index c798a2e4b49..b0ee90484cf 100644 --- a/reactos/dll/win32/msimg32/CMakeLists.txt +++ b/reactos/dll/win32/msimg32/CMakeLists.txt @@ -1,7 +1,6 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) - spec2def(msimg32.dll msimg32.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -9,9 +8,7 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/msimg32.def) add_library(msimg32 SHARED ${SOURCE}) - set_module_type(msimg32 win32dll) target_link_libraries(msimg32 wine) add_importlibs(msimg32 gdi32 msvcrt kernel32 ntdll) add_cd_file(TARGET msimg32 DESTINATION reactos/system32 FOR all) - diff --git a/reactos/dll/win32/msnet32/CMakeLists.txt b/reactos/dll/win32/msnet32/CMakeLists.txt index 2ed1cda1ebd..f1a1abfa092 100644 --- a/reactos/dll/win32/msnet32/CMakeLists.txt +++ b/reactos/dll/win32/msnet32/CMakeLists.txt @@ -1,15 +1,9 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) - spec2def(msnet32.dll msnet32.spec) - add_library(msnet32 SHARED msnet_main.c ${CMAKE_CURRENT_BINARY_DIR}/msnet32.def) - set_module_type(msnet32 win32dll) - target_link_libraries(msnet32 wine) - add_importlibs(msnet32 msvcrt kernel32 ntdll) - add_cd_file(TARGET msnet32 DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/mspatcha/CMakeLists.txt b/reactos/dll/win32/mspatcha/CMakeLists.txt index 3b6c04055a9..e41ca6bd076 100644 --- a/reactos/dll/win32/mspatcha/CMakeLists.txt +++ b/reactos/dll/win32/mspatcha/CMakeLists.txt @@ -1,7 +1,6 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) - spec2def(mspatcha.dll mspatcha.spec) list(APPEND SOURCE diff --git a/reactos/dll/win32/msports/CMakeLists.txt b/reactos/dll/win32/msports/CMakeLists.txt index 53a40962bce..b0fee514b8e 100644 --- a/reactos/dll/win32/msports/CMakeLists.txt +++ b/reactos/dll/win32/msports/CMakeLists.txt @@ -1,5 +1,4 @@ - spec2def(msports.dll msports.spec) list(APPEND SOURCE @@ -21,4 +20,3 @@ target_link_libraries(msports wine) add_importlibs(msports setupapi comctl32 user32 advapi32 msvcrt kernel32 ntdll) add_pch(msports precomp.h SOURCE) add_cd_file(TARGET msports DESTINATION reactos/system32 FOR all) - diff --git a/reactos/dll/win32/mssign32/CMakeLists.txt b/reactos/dll/win32/mssign32/CMakeLists.txt index c1087de206d..fd7406457b6 100644 --- a/reactos/dll/win32/mssign32/CMakeLists.txt +++ b/reactos/dll/win32/mssign32/CMakeLists.txt @@ -1,7 +1,6 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) - spec2def(mssign32.dll mssign32.spec) list(APPEND SOURCE diff --git a/reactos/dll/win32/mssip32/CMakeLists.txt b/reactos/dll/win32/mssip32/CMakeLists.txt index 5860512f227..321ae4eff19 100644 --- a/reactos/dll/win32/mssip32/CMakeLists.txt +++ b/reactos/dll/win32/mssip32/CMakeLists.txt @@ -1,7 +1,6 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) - spec2def(mssip32.dll mssip32.spec) list(APPEND SOURCE diff --git a/reactos/dll/win32/msvcrt20/CMakeLists.txt b/reactos/dll/win32/msvcrt20/CMakeLists.txt index dc114a5c466..707170e94e1 100644 --- a/reactos/dll/win32/msvcrt20/CMakeLists.txt +++ b/reactos/dll/win32/msvcrt20/CMakeLists.txt @@ -1,4 +1,5 @@ +include_directories(${REACTOS_SOURCE_DIR}/lib/sdk/crt/include) spec2def(msvcrt20.dll msvcrt20.spec) add_definitions( @@ -11,8 +12,6 @@ add_definitions( -DCRTDLL -D__MINGW_IMPORT="") -include_directories(${REACTOS_SOURCE_DIR}/lib/sdk/crt/include) - list(APPEND SOURCE msvcrt20.c stubs.c @@ -21,9 +20,7 @@ list(APPEND SOURCE add_library(msvcrt20 SHARED ${SOURCE}) set_module_type(msvcrt20 win32dll ENTRYPOINT DllMain 12) - add_dependencies(msvcrt20 psdk) - target_link_libraries(msvcrt20 crt wine ${PSEH_LIB}) if(MSVC) @@ -32,5 +29,4 @@ if(MSVC) endif() add_importlibs(msvcrt20 kernel32 ntdll) - add_cd_file(TARGET msvcrt20 DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/msvcrt40/CMakeLists.txt b/reactos/dll/win32/msvcrt40/CMakeLists.txt index 7b4e548ed7c..032794b4a73 100644 --- a/reactos/dll/win32/msvcrt40/CMakeLists.txt +++ b/reactos/dll/win32/msvcrt40/CMakeLists.txt @@ -1,4 +1,5 @@ +include_directories(${REACTOS_SOURCE_DIR}/lib/sdk/crt/include) spec2def(msvcrt40.dll msvcrt40.spec) add_definitions( @@ -11,8 +12,6 @@ add_definitions( -DCRTDLL -D__MINGW_IMPORT="") -include_directories(${REACTOS_SOURCE_DIR}/lib/sdk/crt/include) - list(APPEND SOURCE msvcrt40.c stubs.c @@ -20,11 +19,8 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/msvcrt40.def) add_library(msvcrt40 SHARED ${SOURCE}) - set_module_type(msvcrt40 win32dll ENTRYPOINT DllMain 12) - add_dependencies(msvcrt40 psdk) - target_link_libraries(msvcrt40 crt wine ${PSEH_LIB}) if(MSVC) @@ -33,5 +29,4 @@ if(MSVC) endif() add_importlibs(msvcrt40 kernel32 ntdll) - add_cd_file(TARGET msvcrt40 DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/mswsock/CMakeLists.txt b/reactos/dll/win32/mswsock/CMakeLists.txt index ac10be5db76..dbf8c341edc 100644 --- a/reactos/dll/win32/mswsock/CMakeLists.txt +++ b/reactos/dll/win32/mswsock/CMakeLists.txt @@ -1,8 +1,6 @@ - add_definitions(-DLE) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(mswsock.dll mswsock.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -19,4 +17,3 @@ set_module_type(mswsock win32dll UNICODE) add_importlibs(mswsock ws2_32 msvcrt kernel32) add_pch(mswsock precomp.h SOURCE) add_cd_file(TARGET mswsock DESTINATION reactos/system32 FOR all) - diff --git a/reactos/dll/win32/msxml/CMakeLists.txt b/reactos/dll/win32/msxml/CMakeLists.txt index a5cc03c0ba0..2b556711e39 100644 --- a/reactos/dll/win32/msxml/CMakeLists.txt +++ b/reactos/dll/win32/msxml/CMakeLists.txt @@ -7,9 +7,7 @@ add_definitions( -D_WINE) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(msxml.dll msxml.spec) - add_typelib(msxml_tlb.idl) list(APPEND SOURCE @@ -21,8 +19,5 @@ set_module_type(msxml win32dll) set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/msxml_tlb.tlb) target_link_libraries(msxml wine) add_importlibs(msxml msxml3 msvcrt kernel32) - -# msxml_tlb.tlb needs stdole2.tlb add_dependencies(msxml stdole2) - add_cd_file(TARGET msxml DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/msxml2/CMakeLists.txt b/reactos/dll/win32/msxml2/CMakeLists.txt index 5f882c4323d..7753fa4e61f 100644 --- a/reactos/dll/win32/msxml2/CMakeLists.txt +++ b/reactos/dll/win32/msxml2/CMakeLists.txt @@ -7,9 +7,7 @@ add_definitions( -D_WINE) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(msxml2.dll msxml2.spec) - add_typelib(msxml2_tlb.idl) list(APPEND SOURCE @@ -21,8 +19,5 @@ set_module_type(msxml2 win32dll) set_source_files_properties(msxml2.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/msxml2_tlb.tlb) target_link_libraries(msxml2 wine) add_importlibs(msxml2 msxml3 msvcrt kernel32) - -# msxml2_tlb.tlb needs stdole2.tlb add_dependencies(msxml2 stdole2) - add_cd_file(TARGET msxml2 DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/msxml4/CMakeLists.txt b/reactos/dll/win32/msxml4/CMakeLists.txt index 704d094b26b..cf5c9f71139 100644 --- a/reactos/dll/win32/msxml4/CMakeLists.txt +++ b/reactos/dll/win32/msxml4/CMakeLists.txt @@ -8,9 +8,7 @@ add_definitions( -DCOM_NO_WINDOWS_H) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(msxml4.dll msxml4.spec) - add_typelib(msxml4_tlb.idl) list(APPEND SOURCE @@ -22,8 +20,5 @@ set_module_type(msxml4 win32dll) set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/msxml4_tlb.tlb) target_link_libraries(msxml4 wine) add_importlibs(msxml4 msxml3 msvcrt kernel32) - -# msxml4_tlb.tlb needs stdole2.tlb add_dependencies(msxml4 stdole2) - add_cd_file(TARGET msxml4 DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/msxml6/CMakeLists.txt b/reactos/dll/win32/msxml6/CMakeLists.txt index 8edc44c4fcf..ce39d635943 100644 --- a/reactos/dll/win32/msxml6/CMakeLists.txt +++ b/reactos/dll/win32/msxml6/CMakeLists.txt @@ -20,8 +20,5 @@ set_module_type(msxml6 win32dll) set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/msxml6_tlb.tlb) target_link_libraries(msxml6 wine) add_importlibs(msxml6 msxml3 msvcrt kernel32) - -# msxml6_tlb.tlb needs stdole2.tlb add_dependencies(msxml6 stdole2) - add_cd_file(TARGET msxml6 DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/nddeapi/CMakeLists.txt b/reactos/dll/win32/nddeapi/CMakeLists.txt index bdc2c194497..17b6c467345 100644 --- a/reactos/dll/win32/nddeapi/CMakeLists.txt +++ b/reactos/dll/win32/nddeapi/CMakeLists.txt @@ -1,7 +1,6 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) - spec2def(nddeapi.dll nddeapi.spec) list(APPEND SOURCE @@ -11,9 +10,6 @@ list(APPEND SOURCE add_library(nddeapi SHARED ${SOURCE}) set_module_type(nddeapi win32dll) - target_link_libraries(nddeapi wine) - add_importlibs(nddeapi msvcrt kernel32 ntdll) -add_dependencies(nddeapi psdk) add_cd_file(TARGET nddeapi DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/netapi32/CMakeLists.txt b/reactos/dll/win32/netapi32/CMakeLists.txt index 334f617656a..c5eb75cf69e 100644 --- a/reactos/dll/win32/netapi32/CMakeLists.txt +++ b/reactos/dll/win32/netapi32/CMakeLists.txt @@ -28,12 +28,8 @@ add_library(netapi32 SHARED ${CMAKE_CURRENT_BINARY_DIR}/netapi32.def) set_module_type(netapi32 win32dll) - target_link_libraries(netapi32 wine) - add_importlibs(netapi32 iphlpapi ws2_32 advapi32 msvcrt kernel32 ntdll) - add_delay_importlibs(netapi32 samlib secur32) add_pch(netapi32 netapi32.h SOURCE) add_cd_file(TARGET netapi32 DESTINATION reactos/system32 FOR all) - diff --git a/reactos/dll/win32/netcfgx/CMakeLists.txt b/reactos/dll/win32/netcfgx/CMakeLists.txt index 207238666cd..a2816b21810 100644 --- a/reactos/dll/win32/netcfgx/CMakeLists.txt +++ b/reactos/dll/win32/netcfgx/CMakeLists.txt @@ -1,3 +1,4 @@ + remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) diff --git a/reactos/dll/win32/netshell/CMakeLists.txt b/reactos/dll/win32/netshell/CMakeLists.txt index 4a0f4c7de07..593dbd2a75e 100644 --- a/reactos/dll/win32/netshell/CMakeLists.txt +++ b/reactos/dll/win32/netshell/CMakeLists.txt @@ -10,7 +10,6 @@ remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) add_definitions(-D_NETSHELL_) - spec2def(netshell.dll netshell.spec) list(APPEND SOURCE @@ -31,21 +30,6 @@ add_library(netshell SHARED set_module_type(netshell win32dll) target_link_libraries(netshell uuid wine) - -add_importlibs(netshell - msvcrt - shlwapi - shell32 - version - iphlpapi - ole32 - user32 - advapi32 - setupapi - ws2_32 - comctl32 - kernel32 - ntdll) - +add_importlibs(netshell shlwapi shell32 version iphlpapi ole32 user32 advapi32 setupapi ws2_32 comctl32 msvcrt kernel32 ntdll) add_pch(netshell precomp.h SOURCE) add_cd_file(TARGET netshell DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/newdev/CMakeLists.txt b/reactos/dll/win32/newdev/CMakeLists.txt index 996995034a9..7e8c13e940f 100644 --- a/reactos/dll/win32/newdev/CMakeLists.txt +++ b/reactos/dll/win32/newdev/CMakeLists.txt @@ -1,5 +1,4 @@ - spec2def(newdev.dll newdev.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -19,4 +18,3 @@ target_link_libraries(newdev wine) add_importlibs(newdev gdi32 comctl32 setupapi advapi32 user32 shell32 msvcrt kernel32 ntdll) add_pch(newdev newdev_private.h SOURCE) add_cd_file(TARGET newdev DESTINATION reactos/system32 FOR all) - diff --git a/reactos/dll/win32/ntdsapi/CMakeLists.txt b/reactos/dll/win32/ntdsapi/CMakeLists.txt index 55b1878c363..5bb63ff62df 100644 --- a/reactos/dll/win32/ntdsapi/CMakeLists.txt +++ b/reactos/dll/win32/ntdsapi/CMakeLists.txt @@ -1,7 +1,6 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) - spec2def(ntdsapi.dll ntdsapi.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -11,10 +10,6 @@ list(APPEND SOURCE add_library(ntdsapi SHARED ${SOURCE}) set_module_type(ntdsapi win32dll) - target_link_libraries(ntdsapi wine) - add_importlibs(ntdsapi user32 msvcrt kernel32 ntdll) - -add_dependencies(ntdsapi psdk) add_cd_file(TARGET ntdsapi DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/ntlanman/CMakeLists.txt b/reactos/dll/win32/ntlanman/CMakeLists.txt index 8416d1d976f..21773ad6224 100644 --- a/reactos/dll/win32/ntlanman/CMakeLists.txt +++ b/reactos/dll/win32/ntlanman/CMakeLists.txt @@ -1,5 +1,4 @@ - spec2def(ntlanman.dll ntlanman.spec) list(APPEND SOURCE @@ -9,11 +8,7 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/ntlanman.def) add_library(ntlanman SHARED ${SOURCE}) - set_module_type(ntlanman win32dll UNICODE) - target_link_libraries(ntlanman wine) - add_importlibs(ntlanman netapi32 msvcrt kernel32 ntdll) - add_cd_file(TARGET ntlanman DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/ntmarta/CMakeLists.txt b/reactos/dll/win32/ntmarta/CMakeLists.txt index 1890871ab5d..62553858c26 100644 --- a/reactos/dll/win32/ntmarta/CMakeLists.txt +++ b/reactos/dll/win32/ntmarta/CMakeLists.txt @@ -1,6 +1,5 @@ add_definitions(-D__WINESRC__) - spec2def(ntmarta.dll ntmarta.spec) list(APPEND SOURCE @@ -9,14 +8,6 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/ntmarta.def) add_library(ntmarta SHARED ${SOURCE}) - set_module_type(ntmarta win32dll UNICODE) - -add_importlibs(ntmarta - user32 - advapi32 - msvcrt - kernel32 - ntdll) - +add_importlibs(ntmarta user32 advapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET ntmarta DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/ntprint/CMakeLists.txt b/reactos/dll/win32/ntprint/CMakeLists.txt index 29196d54496..2f52596cab2 100644 --- a/reactos/dll/win32/ntprint/CMakeLists.txt +++ b/reactos/dll/win32/ntprint/CMakeLists.txt @@ -1,3 +1,4 @@ + include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) spec2def(ntprint.dll ntprint.spec) @@ -12,5 +13,4 @@ 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/objsel/CMakeLists.txt b/reactos/dll/win32/objsel/CMakeLists.txt index e7fc09f8fdd..26fb063067d 100644 --- a/reactos/dll/win32/objsel/CMakeLists.txt +++ b/reactos/dll/win32/objsel/CMakeLists.txt @@ -1,11 +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) - spec2def(objsel.dll objsel.spec) list(APPEND SOURCE @@ -19,15 +17,7 @@ add_library(objsel SHARED ${CMAKE_CURRENT_BINARY_DIR}/objsel.def) set_module_type(objsel win32dll) - target_link_libraries(objsel uuid wine) - -add_importlibs(objsel - ole32 - advapi32 - msvcrt - kernel32 - ntdll) - +add_importlibs(objsel ole32 advapi32 msvcrt kernel32 ntdll) add_pch(objsel objsel_private.h SOURCE) add_cd_file(TARGET objsel DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/odbccp32/CMakeLists.txt b/reactos/dll/win32/odbccp32/CMakeLists.txt index 6905e458364..cd819ce8a02 100644 --- a/reactos/dll/win32/odbccp32/CMakeLists.txt +++ b/reactos/dll/win32/odbccp32/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(odbccp32.dll odbccp32.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -10,15 +9,7 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/odbccp32.def) add_library(odbccp32 SHARED ${SOURCE}) - set_module_type(odbccp32 win32dll) target_link_libraries(odbccp32 uuid wine) - -add_importlibs(odbccp32 - msvcrt - advapi32 - kernel32 - ntdll) - - +add_importlibs(odbccp32 advapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET odbccp32 DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/ole32/CMakeLists.txt b/reactos/dll/win32/ole32/CMakeLists.txt index 807f8029815..3c023649da1 100644 --- a/reactos/dll/win32/ole32/CMakeLists.txt +++ b/reactos/dll/win32/ole32/CMakeLists.txt @@ -11,7 +11,6 @@ add_definitions( -DWINE_REGISTER_DLL) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(ole32.dll ole32.spec ADD_IMPORTLIB) generate_idl_iids(dcom.idl) add_idl_headers(ole32idl dcom.idl irot.idl) diff --git a/reactos/dll/win32/oleaut32/CMakeLists.txt b/reactos/dll/win32/oleaut32/CMakeLists.txt index 8bcbdc930c9..720015edb8d 100644 --- a/reactos/dll/win32/oleaut32/CMakeLists.txt +++ b/reactos/dll/win32/oleaut32/CMakeLists.txt @@ -12,9 +12,7 @@ add_definitions( -DPROXY_CLSID=CLSID_PSFactoryBuffer) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(oleaut32.dll oleaut32.spec ADD_IMPORTLIB) - add_rpcproxy_files(oleaut32_oaidl.idl oleaut32_ocidl.idl) list(APPEND SOURCE diff --git a/reactos/dll/win32/olecli32/CMakeLists.txt b/reactos/dll/win32/olecli32/CMakeLists.txt index 2d456883e62..b30491a3783 100644 --- a/reactos/dll/win32/olecli32/CMakeLists.txt +++ b/reactos/dll/win32/olecli32/CMakeLists.txt @@ -11,6 +11,5 @@ list(APPEND SOURCE add_library(olecli32 SHARED ${SOURCE}) set_module_type(olecli32 win32dll) target_link_libraries(olecli32 wine) -add_importlibs(olecli32 msvcrt ole32 gdi32 kernel32 ntdll) -add_dependencies(olecli32 psdk) +add_importlibs(olecli32 ole32 gdi32 msvcrt kernel32 ntdll) add_cd_file(TARGET olecli32 DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/olesvr32/CMakeLists.txt b/reactos/dll/win32/olesvr32/CMakeLists.txt index cb27dd109d8..b96852dbab7 100644 --- a/reactos/dll/win32/olesvr32/CMakeLists.txt +++ b/reactos/dll/win32/olesvr32/CMakeLists.txt @@ -1,7 +1,6 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) - spec2def(olesvr32.dll olesvr32.spec) list(APPEND SOURCE @@ -10,11 +9,7 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/olesvr32.def) add_library(olesvr32 SHARED ${SOURCE}) - set_module_type(olesvr32 win32dll) - target_link_libraries(olesvr32 wine) - add_importlibs(olesvr32 msvcrt kernel32 ntdll) -add_dependencies(olesvr32 psdk) add_cd_file(TARGET olesvr32 DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/olethk32/CMakeLists.txt b/reactos/dll/win32/olethk32/CMakeLists.txt index 2056f4919c1..dd2ddddd630 100644 --- a/reactos/dll/win32/olethk32/CMakeLists.txt +++ b/reactos/dll/win32/olethk32/CMakeLists.txt @@ -13,5 +13,4 @@ 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/powrprof/CMakeLists.txt b/reactos/dll/win32/powrprof/CMakeLists.txt index cca66c17a6b..44146f91a35 100644 --- a/reactos/dll/win32/powrprof/CMakeLists.txt +++ b/reactos/dll/win32/powrprof/CMakeLists.txt @@ -1,16 +1,12 @@ spec2def(powrprof.dll powrprof.spec ADD_IMPORTLIB) - add_library(powrprof SHARED powrprof.c powrprof.rc ${CMAKE_CURRENT_BINARY_DIR}/powrprof.def) set_module_type(powrprof win32dll UNICODE) - target_link_libraries(powrprof wine) - add_importlibs(powrprof advapi32 user32 comctl32 msvcrt kernel32 ntdll) - add_cd_file(TARGET powrprof DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/psapi/CMakeLists.txt b/reactos/dll/win32/psapi/CMakeLists.txt index 43d12d45dec..a58d7324d5b 100644 --- a/reactos/dll/win32/psapi/CMakeLists.txt +++ b/reactos/dll/win32/psapi/CMakeLists.txt @@ -7,9 +7,7 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/psapi.def) add_library(psapi SHARED ${SOURCE}) - set_module_type(psapi win32dll) target_link_libraries(psapi ${PSEH_LIB}) add_importlibs(psapi msvcrt kernel32 ntdll) - add_cd_file(TARGET psapi DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/pstorec/CMakeLists.txt b/reactos/dll/win32/pstorec/CMakeLists.txt index b8b65da1918..e75e4e8f2e5 100644 --- a/reactos/dll/win32/pstorec/CMakeLists.txt +++ b/reactos/dll/win32/pstorec/CMakeLists.txt @@ -13,6 +13,5 @@ add_library(pstorec SHARED ${SOURCE} rsrc.rc) set_module_type(pstorec win32dll) target_link_libraries(pstorec uuid wine) add_importlibs(pstorec msvcrt kernel32 ntdll) -# pstorec_tlb.tlb needs stdole2.tlb add_dependencies(pstorec stdole2) add_cd_file(TARGET pstorec DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/qmgrprxy/CMakeLists.txt b/reactos/dll/win32/qmgrprxy/CMakeLists.txt index 0ef7911bd32..24959d6daf8 100644 --- a/reactos/dll/win32/qmgrprxy/CMakeLists.txt +++ b/reactos/dll/win32/qmgrprxy/CMakeLists.txt @@ -4,11 +4,8 @@ add_definitions( -DWINE_REGISTER_DLL) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - generate_idl_iids(qmgrprxy.idl) - spec2def(qmgrprxy.dll qmgrprxy.spec) - add_rpcproxy_files(qmgrprxy.idl) list(APPEND SOURCE @@ -19,7 +16,6 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/qmgrprxy.def) add_library(qmgrprxy SHARED ${SOURCE}) - set_module_type(qmgrprxy win32dll) target_link_libraries(qmgrprxy ${PSEH_LIB} wine) add_importlibs(qmgrprxy rpcrt4 msvcrt kernel32 ntdll) diff --git a/reactos/dll/win32/rasadhlp/CMakeLists.txt b/reactos/dll/win32/rasadhlp/CMakeLists.txt index ef17487612f..100dcf54385 100644 --- a/reactos/dll/win32/rasadhlp/CMakeLists.txt +++ b/reactos/dll/win32/rasadhlp/CMakeLists.txt @@ -1,6 +1,5 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/winsock) - spec2def(rasadhlp.dll rasadhlp.spec) list(APPEND SOURCE diff --git a/reactos/dll/win32/rasapi32/CMakeLists.txt b/reactos/dll/win32/rasapi32/CMakeLists.txt index 18c4baa8e58..547e754f3cd 100644 --- a/reactos/dll/win32/rasapi32/CMakeLists.txt +++ b/reactos/dll/win32/rasapi32/CMakeLists.txt @@ -1,7 +1,6 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) - spec2def(rasapi32.dll rasapi32.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -13,5 +12,4 @@ add_library(rasapi32 SHARED ${SOURCE}) set_module_type(rasapi32 win32dll) target_link_libraries(rasapi32 wine) add_importlibs(rasapi32 msvcrt kernel32 ntdll) -add_dependencies(rasapi32 psdk) add_cd_file(TARGET rasapi32 DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/resutils/CMakeLists.txt b/reactos/dll/win32/resutils/CMakeLists.txt index 4592d25cbae..3433ad47c35 100644 --- a/reactos/dll/win32/resutils/CMakeLists.txt +++ b/reactos/dll/win32/resutils/CMakeLists.txt @@ -1,7 +1,6 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) - spec2def(resutils.dll resutils.spec) list(APPEND SOURCE @@ -10,11 +9,7 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/resutils.def) add_library(resutils SHARED ${SOURCE}) - set_module_type(resutils win32dll) - target_link_libraries(resutils wine) - add_importlibs(resutils msvcrt kernel32 ntdll) - add_cd_file(TARGET resutils DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/rpcrt4/CMakeLists.txt b/reactos/dll/win32/rpcrt4/CMakeLists.txt index 85207ed0121..9f2e6dedc37 100644 --- a/reactos/dll/win32/rpcrt4/CMakeLists.txt +++ b/reactos/dll/win32/rpcrt4/CMakeLists.txt @@ -1,6 +1,6 @@ +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(rpcrt4.dll rpcrt4.spec ADD_IMPORTLIB) - add_rpc_files(client epm.idl) list(APPEND SOURCE @@ -35,8 +35,6 @@ add_definitions( -DCOM_NO_WINDOWS_H -DMSWMSG) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - if(MSVC) add_asm_files(rpcrt4_asm msvc.S) endif() @@ -50,7 +48,6 @@ add_library(rpcrt4 SHARED set_module_type(rpcrt4 win32dll) target_link_libraries(rpcrt4 wine uuid ${PSEH_LIB}) - add_delay_importlibs(rpcrt4 iphlpapi wininet secur32 user32) add_importlibs(rpcrt4 advapi32 ws2_32 shlwapi msvcrt kernel32 ntdll) add_pch(rpcrt4 precomp.h SOURCE) diff --git a/reactos/dll/win32/rsabase/CMakeLists.txt b/reactos/dll/win32/rsabase/CMakeLists.txt index 644eae6c3bd..2120062bd7c 100644 --- a/reactos/dll/win32/rsabase/CMakeLists.txt +++ b/reactos/dll/win32/rsabase/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(rsabase.dll rsabase.spec) list(APPEND SOURCE @@ -9,7 +8,6 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/rsabase.def) add_library(rsabase SHARED ${SOURCE}) - set_module_type(rsabase win32dll ENTRYPOINT 0 ) target_link_libraries(rsabase wine) add_importlibs(rsabase rsaenh ntdll) diff --git a/reactos/dll/win32/samsrv/CMakeLists.txt b/reactos/dll/win32/samsrv/CMakeLists.txt index bb9d34fddff..fc93404567f 100644 --- a/reactos/dll/win32/samsrv/CMakeLists.txt +++ b/reactos/dll/win32/samsrv/CMakeLists.txt @@ -4,7 +4,6 @@ include_directories( ${REACTOS_SOURCE_DIR}/include/reactos/idl) add_rpc_files(server ${REACTOS_SOURCE_DIR}/include/reactos/idl/sam.idl) - spec2def(samsrv.dll samsrv.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -29,9 +28,7 @@ add_library(samsrv SHARED ${CMAKE_CURRENT_BINARY_DIR}/samsrv.def) set_module_type(samsrv win32dll UNICODE) - target_link_libraries(samsrv wine ${PSEH_LIB}) -add_importlibs(samsrv msvcrt rpcrt4 advapi32 kernel32 ntdll) -add_dependencies(samsrv psdk) +add_importlibs(samsrv rpcrt4 advapi32 msvcrt kernel32 ntdll) add_pch(samsrv samsrv.h SOURCE) add_cd_file(TARGET samsrv DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/scrrun/CMakeLists.txt b/reactos/dll/win32/scrrun/CMakeLists.txt index 696a3bdba38..1de6bd1c89c 100644 --- a/reactos/dll/win32/scrrun/CMakeLists.txt +++ b/reactos/dll/win32/scrrun/CMakeLists.txt @@ -2,7 +2,6 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) spec2def(scrrun.dll scrrun.spec) - add_idl_headers(scrrun_idlheader scrrun.idl) add_typelib(scrrun.idl) diff --git a/reactos/dll/win32/secur32/CMakeLists.txt b/reactos/dll/win32/secur32/CMakeLists.txt index 874adc16a6e..20d6774a547 100644 --- a/reactos/dll/win32/secur32/CMakeLists.txt +++ b/reactos/dll/win32/secur32/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__SECUR32__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys) - spec2def(secur32.dll secur32.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -21,11 +20,7 @@ add_library(secur32 SHARED ${CMAKE_CURRENT_BINARY_DIR}/secur32.def) set_module_type(secur32 win32dll UNICODE) - target_link_libraries(secur32 lsalib wine) - add_importlibs(secur32 advapi32 msvcrt kernel32 ntdll) add_pch(secur32 precomp.h SOURCE) - add_cd_file(TARGET secur32 DESTINATION reactos/system32 FOR all) - diff --git a/reactos/dll/win32/setupapi/CMakeLists.txt b/reactos/dll/win32/setupapi/CMakeLists.txt index e4c3f4b8ff4..0992ddfe032 100644 --- a/reactos/dll/win32/setupapi/CMakeLists.txt +++ b/reactos/dll/win32/setupapi/CMakeLists.txt @@ -41,17 +41,6 @@ add_library(setupapi SHARED set_module_type(setupapi win32dll UNICODE) target_link_libraries(setupapi uuid wine ${PSEH_LIB}) add_delay_importlibs(setupapi shell32 winspool wintrust) - -add_importlibs(setupapi - msvcrt - gdi32 - comctl32 - advapi32 - user32 - rpcrt4 - version - kernel32 - ntdll) - +add_importlibs(setupapi gdi32 comctl32 advapi32 user32 rpcrt4 version msvcrt kernel32 ntdll) add_pch(setupapi setupapi_private.h SOURCE) add_cd_file(TARGET setupapi DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/sfc/CMakeLists.txt b/reactos/dll/win32/sfc/CMakeLists.txt index 639e15345d5..350c8d8a54a 100644 --- a/reactos/dll/win32/sfc/CMakeLists.txt +++ b/reactos/dll/win32/sfc/CMakeLists.txt @@ -7,9 +7,6 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/sfc.def) add_library(sfc SHARED ${SOURCE}) - set_module_type(sfc win32dll) - add_importlibs(sfc sfc_os msvcrt kernel32 ntdll) - add_cd_file(TARGET sfc DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/sfc_os/CMakeLists.txt b/reactos/dll/win32/sfc_os/CMakeLists.txt index b9dae3f13b5..d9713f9dec5 100644 --- a/reactos/dll/win32/sfc_os/CMakeLists.txt +++ b/reactos/dll/win32/sfc_os/CMakeLists.txt @@ -7,8 +7,6 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/sfc_os.def) add_library(sfc_os SHARED ${SOURCE}) - set_module_type(sfc_os win32dll) add_importlibs(sfc_os msvcrt kernel32 ntdll) - add_cd_file(TARGET sfc_os DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/shdocvw/CMakeLists.txt b/reactos/dll/win32/shdocvw/CMakeLists.txt index ea8a53d97bb..23e75c7b3b1 100644 --- a/reactos/dll/win32/shdocvw/CMakeLists.txt +++ b/reactos/dll/win32/shdocvw/CMakeLists.txt @@ -24,7 +24,6 @@ set_module_type(shdocvw win32dll) target_link_libraries(shdocvw uuid wine) add_delay_importlibs(shdocvw ole32 oleaut32 ieframe) add_importlibs(shdocvw shlwapi advapi32 msvcrt kernel32 ntdll) -# shdocvw_v1.tlb needs stdole2.tlb add_dependencies(shdocvw stdole2) add_pch(shdocvw shdocvw.h SOURCE) add_cd_file(TARGET shdocvw DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/shell32/CMakeLists.txt b/reactos/dll/win32/shell32/CMakeLists.txt index 27a07464d64..9a6f9c6f3f5 100644 --- a/reactos/dll/win32/shell32/CMakeLists.txt +++ b/reactos/dll/win32/shell32/CMakeLists.txt @@ -1,5 +1,6 @@ set_cpp(WITH_RUNTIME) +spec2def(shell32.dll shell32.spec ADD_IMPORTLIB) remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) @@ -13,8 +14,6 @@ include_directories( ${REACTOS_SOURCE_DIR}/lib/atl ${REACTOS_SOURCE_DIR}) -spec2def(shell32.dll shell32.spec ADD_IMPORTLIB) - list(APPEND SOURCE #authors.cpp autocomplete.cpp @@ -83,30 +82,8 @@ add_library(shell32 SHARED ${CMAKE_CURRENT_BINARY_DIR}/shell32.def) set_module_type(shell32 win32dll UNICODE HOTPATCHABLE) - -target_link_libraries(shell32 - atlnew - wine - uuid - recyclebin) - +target_link_libraries(shell32 atlnew wine uuid recyclebin) add_delay_importlibs(shell32 ole32 version fmifs) - -add_importlibs(shell32 - advapi32 - browseui - gdi32 - user32 - comctl32 - comdlg32 - shdocvw - shlwapi - devmgr - winspool - winmm - msvcrt - kernel32 - ntdll) - +add_importlibs(shell32 advapi32 browseui gdi32 user32 comctl32 comdlg32 shdocvw shlwapi devmgr winspool winmm msvcrt kernel32 ntdll) add_pch(shell32 precomp.h SOURCE) add_cd_file(TARGET shell32 DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/shfolder/CMakeLists.txt b/reactos/dll/win32/shfolder/CMakeLists.txt index e973f7cae9f..c52580f322e 100644 --- a/reactos/dll/win32/shfolder/CMakeLists.txt +++ b/reactos/dll/win32/shfolder/CMakeLists.txt @@ -1,7 +1,6 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) - spec2def(shfolder.dll shfolder.spec) list(APPEND SOURCE @@ -9,9 +8,7 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/shfolder.def) add_library(shfolder SHARED ${SOURCE}) - set_module_type(shfolder win32dll ENTRYPOINT 0 ) - target_link_libraries(shfolder wine) add_importlibs(shfolder shell32 kernel32 ntdll) add_dependencies(shfolder psdk) diff --git a/reactos/dll/win32/shimgvw/CMakeLists.txt b/reactos/dll/win32/shimgvw/CMakeLists.txt index 1da24dda9af..c923f33bc80 100644 --- a/reactos/dll/win32/shimgvw/CMakeLists.txt +++ b/reactos/dll/win32/shimgvw/CMakeLists.txt @@ -10,16 +10,5 @@ list(APPEND SOURCE add_library(shimgvw SHARED ${SOURCE}) set_module_type(shimgvw win32dll) target_link_libraries(shimgvw wine) - -add_importlibs(shimgvw - advapi32 - comctl32 - user32 - gdi32 - gdiplus - comdlg32 - msvcrt - kernel32 - ntdll) - +add_importlibs(shimgvw advapi32 comctl32 user32 gdi32 gdiplus comdlg32 msvcrt kernel32 ntdll) add_cd_file(TARGET shimgvw DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/smdll/CMakeLists.txt b/reactos/dll/win32/smdll/CMakeLists.txt index 1b4648bf13d..e54445402b2 100644 --- a/reactos/dll/win32/smdll/CMakeLists.txt +++ b/reactos/dll/win32/smdll/CMakeLists.txt @@ -1,6 +1,5 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys) - spec2def(smdll.dll smdll.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -19,4 +18,3 @@ add_importlibs(smdll ntdll) add_pch(smdll precomp.h SOURCE) add_dependencies(smdll psdk) add_cd_file(TARGET smdll DESTINATION reactos/system32 FOR all) - diff --git a/reactos/dll/win32/sndblst/CMakeLists.txt b/reactos/dll/win32/sndblst/CMakeLists.txt index dd4c3ac3b76..e1b77cc0fed 100644 --- a/reactos/dll/win32/sndblst/CMakeLists.txt +++ b/reactos/dll/win32/sndblst/CMakeLists.txt @@ -1,8 +1,6 @@ - add_definitions(-DDEBUG_NT4) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/sound) - spec2def(sndblst.dll sndblst.spec) list(APPEND SOURCE @@ -10,7 +8,6 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/sndblst.def) add_library(sndblst SHARED ${SOURCE}) - set_module_type(sndblst win32dll UNICODE) target_link_libraries(sndblst mment4 mmebuddy) add_importlibs(sndblst user32 winmm advapi32 msvcrt kernel32 ntdll) diff --git a/reactos/dll/win32/softpub/CMakeLists.txt b/reactos/dll/win32/softpub/CMakeLists.txt index cef2c966101..2caf1ec30f2 100644 --- a/reactos/dll/win32/softpub/CMakeLists.txt +++ b/reactos/dll/win32/softpub/CMakeLists.txt @@ -1,16 +1,13 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(softpub.dll softpub.spec) -add_library(softpub SHARED softpub.rc +add_library(softpub SHARED + softpub.rc ${CMAKE_CURRENT_BINARY_DIR}/softpub.def) set_module_type(softpub win32dll ENTRYPOINT 0 ) - target_link_libraries(softpub wine) - add_importlibs(softpub wintrust) - add_cd_file(TARGET softpub DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/srclient/CMakeLists.txt b/reactos/dll/win32/srclient/CMakeLists.txt index 8e6d69dc2d5..c65d5d3b65e 100644 --- a/reactos/dll/win32/srclient/CMakeLists.txt +++ b/reactos/dll/win32/srclient/CMakeLists.txt @@ -8,8 +8,5 @@ list(APPEND SOURCE add_library(srclient SHARED ${SOURCE}) set_module_type(srclient win32dll) - add_importlibs(srclient msvcrt kernel32 ntdll) -add_dependencies(srclient psdk) - add_cd_file(TARGET srclient DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/stdole32.tlb/CMakeLists.txt b/reactos/dll/win32/stdole32.tlb/CMakeLists.txt index 897e12546f1..2e0babc9864 100644 --- a/reactos/dll/win32/stdole32.tlb/CMakeLists.txt +++ b/reactos/dll/win32/stdole32.tlb/CMakeLists.txt @@ -1,9 +1,7 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - add_typelib(std_ole_v1.idl) - spec2def(stdole32.tlb stdole32.tlb.spec) list(APPEND SOURCE @@ -11,7 +9,6 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/stdole32.def) set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/std_ole_v1.tlb) - add_library(stdole32.tlb SHARED ${SOURCE}) set_module_type(stdole32.tlb module) set_target_properties(stdole32.tlb PROPERTIES SUFFIX "") diff --git a/reactos/dll/win32/syssetup/CMakeLists.txt b/reactos/dll/win32/syssetup/CMakeLists.txt index 6c0b48147cc..2698536a262 100644 --- a/reactos/dll/win32/syssetup/CMakeLists.txt +++ b/reactos/dll/win32/syssetup/CMakeLists.txt @@ -19,20 +19,5 @@ add_library(syssetup SHARED add_pch(syssetup precomp.h SOURCE) set_module_type(syssetup win32dll UNICODE) target_link_libraries(syssetup uuid wine ${PSEH_LIB}) - -add_importlibs(syssetup - msvcrt - advapi32 - gdi32 - user32 - samlib - userenv - comctl32 - setupapi - ole32 - shell32 - shlwapi - kernel32 - ntdll) - +add_importlibs(syssetup advapi32 gdi32 user32 samlib userenv comctl32 setupapi ole32 shell32 shlwapi msvcrt kernel32 ntdll) add_cd_file(TARGET syssetup DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/t2embed/CMakeLists.txt b/reactos/dll/win32/t2embed/CMakeLists.txt index 32dc19987f4..ac925625b0e 100644 --- a/reactos/dll/win32/t2embed/CMakeLists.txt +++ b/reactos/dll/win32/t2embed/CMakeLists.txt @@ -1,7 +1,5 @@ - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(t2embed.dll t2embed.spec) list(APPEND SOURCE @@ -11,11 +9,7 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/t2embed.def) add_library(t2embed SHARED ${SOURCE}) - set_module_type(t2embed win32dll UNICODE) - target_link_libraries(t2embed wine) - add_importlibs(t2embed gdi32 user32 advapi32 version msvcrt kernel32 ntdll) - add_cd_file(TARGET t2embed DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/traffic/CMakeLists.txt b/reactos/dll/win32/traffic/CMakeLists.txt index 64764005630..b0669c2de20 100644 --- a/reactos/dll/win32/traffic/CMakeLists.txt +++ b/reactos/dll/win32/traffic/CMakeLists.txt @@ -1,7 +1,6 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) - spec2def(traffic.dll traffic.spec) list(APPEND SOURCE @@ -10,11 +9,7 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/traffic.def) add_library(traffic SHARED ${SOURCE}) - set_module_type(traffic win32dll) - target_link_libraries(traffic wine) - add_importlibs(traffic msvcrt kernel32 ntdll) -add_dependencies(traffic psdk) add_cd_file(TARGET traffic DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/uext2/CMakeLists.txt b/reactos/dll/win32/uext2/CMakeLists.txt index 8a18c50a1ca..eef6c63213a 100644 --- a/reactos/dll/win32/uext2/CMakeLists.txt +++ b/reactos/dll/win32/uext2/CMakeLists.txt @@ -7,7 +7,6 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/uext2.def) add_library(uext2 SHARED ${SOURCE}) - set_module_type(uext2 nativedll) target_link_libraries(uext2 ext2lib) add_importlibs(uext2 ntdll) diff --git a/reactos/dll/win32/ufat/CMakeLists.txt b/reactos/dll/win32/ufat/CMakeLists.txt index 9548798a627..432af9db096 100644 --- a/reactos/dll/win32/ufat/CMakeLists.txt +++ b/reactos/dll/win32/ufat/CMakeLists.txt @@ -7,7 +7,6 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/ufat.def) add_library(ufat SHARED ${SOURCE}) - set_module_type(ufat nativedll) target_link_libraries(ufat vfatlib) add_importlibs(ufat ntdll) diff --git a/reactos/dll/win32/ufatx/CMakeLists.txt b/reactos/dll/win32/ufatx/CMakeLists.txt index 4b7fa840a8e..927efb516e5 100644 --- a/reactos/dll/win32/ufatx/CMakeLists.txt +++ b/reactos/dll/win32/ufatx/CMakeLists.txt @@ -6,11 +6,8 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/ufatx.def) add_library(ufatx SHARED ${SOURCE}) - target_link_libraries(ufatx vfatxlib) set_module_type(ufatx nativedll ENTRYPOINT 0 ) - add_importlibs(ufatx ntdll) - add_dependencies(ufatx psdk) add_cd_file(TARGET ufatx DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/unicows/CMakeLists.txt b/reactos/dll/win32/unicows/CMakeLists.txt index e57826ef82d..93c9f2c76cb 100644 --- a/reactos/dll/win32/unicows/CMakeLists.txt +++ b/reactos/dll/win32/unicows/CMakeLists.txt @@ -6,26 +6,6 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/unicows.def) add_library(unicows SHARED ${SOURCE}) - set_module_type(unicows win32dll) - -add_importlibs(unicows - avicap32 - msvfw32 - oledlg - comdlg32 - shell32 - winmm - winspool - rasapi32 - secur32 - sensapi - version - user32 - mpr - gdi32 - advapi32 - msvcrt - kernel32 - ntdll) +add_importlibs(unicows avicap32 msvfw32 oledlg comdlg32 shell32 winmm winspool rasapi32 secur32 sensapi version user32 mpr gdi32 advapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET unicows DESTINATION reactos FOR all) diff --git a/reactos/dll/win32/untfs/CMakeLists.txt b/reactos/dll/win32/untfs/CMakeLists.txt index 818df413b80..c65863708e1 100644 --- a/reactos/dll/win32/untfs/CMakeLists.txt +++ b/reactos/dll/win32/untfs/CMakeLists.txt @@ -7,7 +7,6 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/untfs.def) add_library(untfs SHARED ${SOURCE}) - set_module_type(untfs nativedll) target_link_libraries(untfs ntfslib) add_importlibs(untfs ntdll) diff --git a/reactos/dll/win32/updspapi/CMakeLists.txt b/reactos/dll/win32/updspapi/CMakeLists.txt index 18d1b1c8e52..ca4d87b96b8 100644 --- a/reactos/dll/win32/updspapi/CMakeLists.txt +++ b/reactos/dll/win32/updspapi/CMakeLists.txt @@ -1,7 +1,6 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) - spec2def(updspapi.dll updspapi.spec) list(APPEND SOURCE @@ -11,10 +10,6 @@ list(APPEND SOURCE add_library(updspapi SHARED ${SOURCE}) set_module_type(updspapi win32dll) - target_link_libraries(updspapi wine) - -add_importlibs(updspapi msvcrt setupapi kernel32 ntdll) -add_dependencies(updspapi psdk) - +add_importlibs(updspapi setupapi msvcrt kernel32 ntdll) add_cd_file(TARGET updspapi DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/url/CMakeLists.txt b/reactos/dll/win32/url/CMakeLists.txt index 0d1cc226918..7d18d43f9b2 100644 --- a/reactos/dll/win32/url/CMakeLists.txt +++ b/reactos/dll/win32/url/CMakeLists.txt @@ -1,7 +1,6 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) - spec2def(url.dll url.spec) list(APPEND SOURCE diff --git a/reactos/dll/win32/vdmdbg/CMakeLists.txt b/reactos/dll/win32/vdmdbg/CMakeLists.txt index 3fe251b981e..cef101a4b36 100644 --- a/reactos/dll/win32/vdmdbg/CMakeLists.txt +++ b/reactos/dll/win32/vdmdbg/CMakeLists.txt @@ -6,7 +6,6 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/vdmdbg.def) add_library(vdmdbg SHARED ${SOURCE}) - set_module_type(vdmdbg win32dll UNICODE) add_importlibs(vdmdbg msvcrt kernel32 ntdll) add_cd_file(TARGET vdmdbg DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/wdmaud.drv/CMakeLists.txt b/reactos/dll/win32/wdmaud.drv/CMakeLists.txt index f23bc045c78..0da282b7f71 100644 --- a/reactos/dll/win32/wdmaud.drv/CMakeLists.txt +++ b/reactos/dll/win32/wdmaud.drv/CMakeLists.txt @@ -1,6 +1,4 @@ - - include_directories( ${REACTOS_SOURCE_DIR}/include/reactos/libs/sound ${REACTOS_SOURCE_DIR}/drivers/wdm/audio/legacy/wdmaud @@ -22,13 +20,8 @@ add_library(wdmaud.drv SHARED ${CMAKE_CURRENT_BINARY_DIR}/wdmaud.def) set_module_type(wdmaud.drv win32dll UNICODE) - set_target_properties(wdmaud.drv PROPERTIES SUFFIX "") - -target_link_libraries(wdmaud.drv - mmebuddy - libsamplerate - mmixer) +target_link_libraries(wdmaud.drv mmebuddy libsamplerate mmixer) if(CMAKE_C_COMPILER_ID STREQUAL "Clang") target_link_libraries(wdmaud.drv mingwex) diff --git a/reactos/dll/win32/windowscodecs/CMakeLists.txt b/reactos/dll/win32/windowscodecs/CMakeLists.txt index bb583b87d3b..9c9ef551127 100644 --- a/reactos/dll/win32/windowscodecs/CMakeLists.txt +++ b/reactos/dll/win32/windowscodecs/CMakeLists.txt @@ -20,7 +20,6 @@ if(MSVC) endif() spec2def(windowscodecs.dll windowscodecs.spec ADD_IMPORTLIB) - add_rpcproxy_files(windowscodecs_wincodec.idl) list(APPEND SOURCE diff --git a/reactos/dll/win32/winfax/CMakeLists.txt b/reactos/dll/win32/winfax/CMakeLists.txt index 6977a9d6abc..830d8e62fb0 100644 --- a/reactos/dll/win32/winfax/CMakeLists.txt +++ b/reactos/dll/win32/winfax/CMakeLists.txt @@ -7,9 +7,6 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/winfax.def) add_library(winfax SHARED ${SOURCE}) - set_module_type(winfax win32dll) - add_importlibs(winfax msvcrt kernel32 ntdll) -add_dependencies(winfax psdk) add_cd_file(TARGET winfax DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/wing32/CMakeLists.txt b/reactos/dll/win32/wing32/CMakeLists.txt index b25a72d2f45..a4980b8eb2b 100644 --- a/reactos/dll/win32/wing32/CMakeLists.txt +++ b/reactos/dll/win32/wing32/CMakeLists.txt @@ -1,5 +1,4 @@ - spec2def(wing32.dll wing32.spec) list(APPEND SOURCE @@ -7,9 +6,6 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/wing32.def) add_library(wing32 SHARED ${SOURCE}) - set_module_type(wing32 win32dll UNICODE) - add_importlibs(wing32 user32 gdi32 msvcrt kernel32) -add_dependencies(wing32 psdk) add_cd_file(TARGET wing32 DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/winhttp/CMakeLists.txt b/reactos/dll/win32/winhttp/CMakeLists.txt index 2058bf171c8..4d7ef0dfa72 100644 --- a/reactos/dll/win32/winhttp/CMakeLists.txt +++ b/reactos/dll/win32/winhttp/CMakeLists.txt @@ -28,6 +28,6 @@ set_module_type(winhttp win32dll) target_link_libraries(winhttp uuid wine) add_delay_importlibs(winhttp oleaut32 ole32 crypt32 secur32) add_importlibs(winhttp user32 advapi32 ws2_32 jsproxy msvcrt kernel32 ntdll) -add_dependencies(winhttp stdole2) # wininet_tlb.tlb needs stdole2.tlb +add_dependencies(winhttp stdole2) add_pch(winhttp winhttp_private.h SOURCE) add_cd_file(TARGET winhttp DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/winmm/CMakeLists.txt b/reactos/dll/win32/winmm/CMakeLists.txt index 0c59c51db63..5be73d9d6ca 100644 --- a/reactos/dll/win32/winmm/CMakeLists.txt +++ b/reactos/dll/win32/winmm/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D_WINE) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(winmm.dll winmm.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -26,9 +25,10 @@ set_module_type(winmm win32dll HOTPATCHABLE) target_link_libraries(winmm wine ${PSEH_LIB}) add_importlibs(winmm advapi32 user32 msvcrt kernel32 ntdll) add_pch(winmm winemm.h SOURCE) -add_subdirectory(midimap) add_cd_file(TARGET winmm DESTINATION reactos/system32 FOR all) if((NOT MSVC) AND (NOT CMAKE_C_COMPILER_ID STREQUAL "Clang")) add_target_compile_flags(winmm "-Wno-unused-but-set-variable") endif() + +add_subdirectory(midimap) diff --git a/reactos/dll/win32/winmm/midimap/CMakeLists.txt b/reactos/dll/win32/winmm/midimap/CMakeLists.txt index 18ddfbc24ee..a025f148c11 100644 --- a/reactos/dll/win32/winmm/midimap/CMakeLists.txt +++ b/reactos/dll/win32/winmm/midimap/CMakeLists.txt @@ -7,10 +7,6 @@ add_library(midimap SHARED ${CMAKE_CURRENT_BINARY_DIR}/midimap.def) set_module_type(midimap win32dll UNICODE) - target_link_libraries(midimap uuid wine) - add_importlibs(midimap advapi32 user32 winmm msvcrt kernel32 ntdll) -add_dependencies(midimap psdk) add_cd_file(TARGET midimap DESTINATION reactos/system32 FOR all) - diff --git a/reactos/dll/win32/wlanapi/CMakeLists.txt b/reactos/dll/win32/wlanapi/CMakeLists.txt index 8c356b07b6e..233b3033d32 100644 --- a/reactos/dll/win32/wlanapi/CMakeLists.txt +++ b/reactos/dll/win32/wlanapi/CMakeLists.txt @@ -1,8 +1,6 @@ include_directories( ${REACTOS_SOURCE_DIR}/include/reactos/idl) - add_rpc_files(client ${REACTOS_SOURCE_DIR}/include/reactos/idl/wlansvc.idl) - spec2def(wlanapi.dll wlanapi.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -12,15 +10,7 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/wlansvc_c.c) add_library(wlanapi SHARED ${SOURCE}) - set_module_type(wlanapi win32dll) - -target_link_libraries(wlanapi - wine - ${PSEH_LIB}) - +target_link_libraries(wlanapi wine ${PSEH_LIB}) add_importlibs(wlanapi rpcrt4 msvcrt kernel32 ntdll) - - -add_dependencies(wlanapi psdk) add_cd_file(TARGET wlanapi DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/wmi/CMakeLists.txt b/reactos/dll/win32/wmi/CMakeLists.txt index 7d37a29e7c3..0519d44940e 100644 --- a/reactos/dll/win32/wmi/CMakeLists.txt +++ b/reactos/dll/win32/wmi/CMakeLists.txt @@ -6,9 +6,7 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/wmi.def) add_library(wmi SHARED ${SOURCE}) - set_module_type(wmi win32dll ENTRYPOINT 0 ) - add_importlibs(wmi advapi32) add_dependencies(wmi psdk) add_cd_file(TARGET wmi DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/ws2_32/CMakeLists.txt b/reactos/dll/win32/ws2_32/CMakeLists.txt index 0cded311199..a7ad9645cde 100644 --- a/reactos/dll/win32/ws2_32/CMakeLists.txt +++ b/reactos/dll/win32/ws2_32/CMakeLists.txt @@ -1,10 +1,8 @@ add_definitions(-DLE) add_definitions(-DWINSOCK_API_LINKAGE=DECLSPEC_EXPORT) - include_directories(BEFORE include) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(ws2_32.dll ws2_32.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -31,4 +29,3 @@ add_delay_importlibs(ws2_32 user32) add_importlibs(ws2_32 advapi32 dnsapi ws2help msvcrt kernel32 ntdll) add_pch(ws2_32 include/ws2_32.h SOURCE) add_cd_file(TARGET ws2_32 DESTINATION reactos/system32 FOR all) - diff --git a/reactos/dll/win32/ws2_32_new/CMakeLists.txt b/reactos/dll/win32/ws2_32_new/CMakeLists.txt index 250439a108b..7754c966825 100644 --- a/reactos/dll/win32/ws2_32_new/CMakeLists.txt +++ b/reactos/dll/win32/ws2_32_new/CMakeLists.txt @@ -1,12 +1,11 @@ add_definitions(-DLE) +spec2def(ws2_32_new.dll ws2_32.spec) include_directories( inc ${REACTOS_SOURCE_DIR}/include/reactos/winsock) -spec2def(ws2_32_new.dll ws2_32.spec) - list(APPEND SOURCE src/addrconv.c src/addrinfo.c diff --git a/reactos/dll/win32/ws2help/CMakeLists.txt b/reactos/dll/win32/ws2help/CMakeLists.txt index 277270a2349..d0412240ef4 100644 --- a/reactos/dll/win32/ws2help/CMakeLists.txt +++ b/reactos/dll/win32/ws2help/CMakeLists.txt @@ -1,6 +1,5 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/winsock) - spec2def(ws2help.dll ws2help.spec ADD_IMPORTLIB) list(APPEND SOURCE diff --git a/reactos/dll/win32/wshirda/CMakeLists.txt b/reactos/dll/win32/wshirda/CMakeLists.txt index ea110992e14..d7fc1562c94 100644 --- a/reactos/dll/win32/wshirda/CMakeLists.txt +++ b/reactos/dll/win32/wshirda/CMakeLists.txt @@ -1,5 +1,4 @@ - spec2def(wshirda.dll wshirda.spec) list(APPEND SOURCE @@ -8,7 +7,6 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/wshirda.def) add_library(wshirda SHARED ${SOURCE}) - set_module_type(wshirda win32dll UNICODE) add_importlibs(wshirda ws2_32 msvcrt kernel32 ntdll) add_cd_file(TARGET wshirda DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/wshtcpip/CMakeLists.txt b/reactos/dll/win32/wshtcpip/CMakeLists.txt index e0c94acc1bd..41439e96954 100644 --- a/reactos/dll/win32/wshtcpip/CMakeLists.txt +++ b/reactos/dll/win32/wshtcpip/CMakeLists.txt @@ -1,7 +1,5 @@ - include_directories(${REACTOS_SOURCE_DIR}/lib/tdilib) - spec2def(wshtcpip.dll wshtcpip.spec) list(APPEND SOURCE @@ -10,10 +8,7 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/wshtcpip.def) add_library(wshtcpip SHARED ${SOURCE}) - set_module_type(wshtcpip win32dll UNICODE) - target_link_libraries(wshtcpip tdilib) add_importlibs(wshtcpip ws2_32 msvcrt kernel32 ntdll) -add_dependencies(wshtcpip psdk) add_cd_file(TARGET wshtcpip DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/wsock32/CMakeLists.txt b/reactos/dll/win32/wsock32/CMakeLists.txt index 0f09ad6ffa7..2826ec78046 100644 --- a/reactos/dll/win32/wsock32/CMakeLists.txt +++ b/reactos/dll/win32/wsock32/CMakeLists.txt @@ -1,9 +1,6 @@ - spec2def(wsock32.dll wsock32.spec) add_library(wsock32 SHARED stubs.c wsock32.rc ${CMAKE_CURRENT_BINARY_DIR}/wsock32.def) - set_module_type(wsock32 win32dll UNICODE) - add_importlibs(wsock32 mswsock ws2_32 msvcrt kernel32 ntdll) add_cd_file(TARGET wsock32 DESTINATION reactos/system32 FOR all) diff --git a/reactos/drivers/base/bootvid/CMakeLists.txt b/reactos/drivers/base/bootvid/CMakeLists.txt index 6628ffd4ea5..8b1321b5524 100644 --- a/reactos/drivers/base/bootvid/CMakeLists.txt +++ b/reactos/drivers/base/bootvid/CMakeLists.txt @@ -20,9 +20,7 @@ add_library(bootvid SHARED ${CMAKE_CURRENT_BINARY_DIR}/bootvid.def) set_module_type(bootvid kerneldll ENTRYPOINT 0) - add_importlibs(bootvid ntoskrnl hal) add_pch(bootvid precomp.h SOURCE) add_dependencies(bootvid psdk) add_cd_file(TARGET bootvid DESTINATION reactos/system32 NO_CAB FOR all) - diff --git a/reactos/drivers/base/condrv/CMakeLists.txt b/reactos/drivers/base/condrv/CMakeLists.txt index b4137cecb0b..ab4de2a5469 100644 --- a/reactos/drivers/base/condrv/CMakeLists.txt +++ b/reactos/drivers/base/condrv/CMakeLists.txt @@ -13,10 +13,8 @@ add_library(condrv SHARED condrv.rc) # ${CMAKE_CURRENT_BINARY_DIR}/condrv.def) -add_pch(condrv condrv.h SOURCE) - set_module_type(condrv kernelmodedriver) target_link_libraries(condrv ${PSEH_LIB}) add_importlibs(condrv ntoskrnl hal) - +add_pch(condrv condrv.h SOURCE) add_cd_file(TARGET condrv DESTINATION reactos/system32/drivers NO_CAB FOR all) diff --git a/reactos/drivers/base/kdgdb/CMakeLists.txt b/reactos/drivers/base/kdgdb/CMakeLists.txt index bb9236c956d..2aaf82c1d37 100644 --- a/reactos/drivers/base/kdgdb/CMakeLists.txt +++ b/reactos/drivers/base/kdgdb/CMakeLists.txt @@ -2,9 +2,9 @@ spec2def(kdcom.dll kdgdb.spec ADD_IMPORTLIB) list(APPEND SOURCE - gdb_input.c - gdb_receive.c - gdb_send.c + gdb_input.c + gdb_receive.c + gdb_send.c kdcom.c kdpacket.c utils.c @@ -12,7 +12,7 @@ list(APPEND SOURCE # TODO: AMD64, ARM... if(ARCH STREQUAL "i386") - list(APPEND SOURCE i386_sup.c) + list(APPEND SOURCE i386_sup.c) endif() add_library(kdcom SHARED @@ -23,7 +23,6 @@ add_library(kdcom SHARED set_entrypoint(kdcom 0) set_subsystem(kdcom native) set_image_base(kdcom 0x00010000) - add_importlibs(kdcom ntoskrnl hal) target_link_libraries(kdcom cportlib) add_pch(kdcom kdgdb.h SOURCE) diff --git a/reactos/drivers/base/kdrosdbg/CMakeLists.txt b/reactos/drivers/base/kdrosdbg/CMakeLists.txt index d4f8baffd5d..5c69e731783 100644 --- a/reactos/drivers/base/kdrosdbg/CMakeLists.txt +++ b/reactos/drivers/base/kdrosdbg/CMakeLists.txt @@ -7,11 +7,8 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/kdcom.def) add_library(kdcom SHARED ${SOURCE}) - set_module_type(kdcom kerneldll ENTRYPOINT 0) - add_importlibs(kdcom ntoskrnl hal) target_link_libraries(kdcom cportlib) add_dependencies(kdcom psdk) - add_cd_file(TARGET kdcom DESTINATION reactos/system32 NO_CAB FOR all) diff --git a/reactos/drivers/base/nmidebug/CMakeLists.txt b/reactos/drivers/base/nmidebug/CMakeLists.txt index 3293f041905..f54fe194f75 100644 --- a/reactos/drivers/base/nmidebug/CMakeLists.txt +++ b/reactos/drivers/base/nmidebug/CMakeLists.txt @@ -1,7 +1,5 @@ add_library(nmidebug SHARED nmidebug.c nmidebug.rc) - set_module_type(nmidebug kernelmodedriver) add_importlibs(nmidebug ntoskrnl hal) - add_cd_file(TARGET nmidebug DESTINATION reactos/system32/drivers NO_CAB FOR all) diff --git a/reactos/drivers/base/null/CMakeLists.txt b/reactos/drivers/base/null/CMakeLists.txt index b3f3b2d2f5f..830eb4018bb 100644 --- a/reactos/drivers/base/null/CMakeLists.txt +++ b/reactos/drivers/base/null/CMakeLists.txt @@ -1,9 +1,6 @@ add_library(null SHARED null.c null.rc) - target_link_libraries(null ${PSEH_LIB}) - set_module_type(null kernelmodedriver) add_importlibs(null ntoskrnl hal) - add_cd_file(TARGET null DESTINATION reactos/system32/drivers FOR all) diff --git a/reactos/drivers/battery/battc/CMakeLists.txt b/reactos/drivers/battery/battc/CMakeLists.txt index a0bea76b4d4..e112069c575 100644 --- a/reactos/drivers/battery/battc/CMakeLists.txt +++ b/reactos/drivers/battery/battc/CMakeLists.txt @@ -1,6 +1,5 @@ add_definitions(-D_BATTERYCLASS_) - spec2def(battc.sys battc.spec ADD_IMPORTLIB) add_library(battc SHARED @@ -10,6 +9,4 @@ add_library(battc SHARED set_module_type(battc kernelmodedriver) add_importlibs(battc ntoskrnl hal) - add_cd_file(TARGET battc DESTINATION reactos/system32/drivers FOR all) - diff --git a/reactos/drivers/bus/acpi/cmbatt/CMakeLists.txt b/reactos/drivers/bus/acpi/cmbatt/CMakeLists.txt index ff112bbff05..bf13da15940 100644 --- a/reactos/drivers/bus/acpi/cmbatt/CMakeLists.txt +++ b/reactos/drivers/bus/acpi/cmbatt/CMakeLists.txt @@ -13,8 +13,5 @@ add_library(cmbatt SHARED set_module_type(cmbatt kernelmodedriver) add_importlibs(cmbatt ntoskrnl hal battc wmilib) - add_pch(cmbatt cmbatt.h SOURCE) - - add_cd_file(TARGET cmbatt DESTINATION reactos/system32/drivers FOR all) diff --git a/reactos/drivers/bus/acpi/compbatt/CMakeLists.txt b/reactos/drivers/bus/acpi/compbatt/CMakeLists.txt index f85e15bccba..b394648dee4 100644 --- a/reactos/drivers/bus/acpi/compbatt/CMakeLists.txt +++ b/reactos/drivers/bus/acpi/compbatt/CMakeLists.txt @@ -12,7 +12,5 @@ add_library(compbatt SHARED set_module_type(compbatt kernelmodedriver) add_importlibs(compbatt ntoskrnl hal battc) - add_pch(compbatt compbatt.h SOURCE) - add_cd_file(TARGET compbatt DESTINATION reactos/system32/drivers FOR all) diff --git a/reactos/drivers/bus/pcix/CMakeLists.txt b/reactos/drivers/bus/pcix/CMakeLists.txt index fa4e3bddcbe..d17325c2ad1 100644 --- a/reactos/drivers/bus/pcix/CMakeLists.txt +++ b/reactos/drivers/bus/pcix/CMakeLists.txt @@ -42,8 +42,6 @@ add_library(pcix SHARED set_module_type(pcix kernelmodedriver) add_importlibs(pcix ntoskrnl hal) - add_pch(pcix pci.h SOURCE) add_dependencies(pcix pciclass) - add_cd_file(TARGET pcix DESTINATION reactos/system32/drivers NO_CAB FOR all) diff --git a/reactos/drivers/crypto/ksecdd/CMakeLists.txt b/reactos/drivers/crypto/ksecdd/CMakeLists.txt index 389f6a3db42..ae1bd441310 100644 --- a/reactos/drivers/crypto/ksecdd/CMakeLists.txt +++ b/reactos/drivers/crypto/ksecdd/CMakeLists.txt @@ -6,13 +6,13 @@ include_directories( ${REACTOS_SOURCE_DIR}/lib/cryptlib) list(APPEND SOURCE - ksecdd.c - dispatch.c - crypt.c - random.c - stubs.c - ksecdd.rc - ${CMAKE_CURRENT_BINARY_DIR}/ksecdd.def) + ksecdd.c + dispatch.c + crypt.c + random.c + stubs.c + ksecdd.rc + ${CMAKE_CURRENT_BINARY_DIR}/ksecdd.def) add_library(ksecdd SHARED ${SOURCE}) target_link_libraries(ksecdd cryptlib pseh) diff --git a/reactos/drivers/filesystems/cdfs/CMakeLists.txt b/reactos/drivers/filesystems/cdfs/CMakeLists.txt index 9bec1b4356e..d8aaaaeb9c0 100644 --- a/reactos/drivers/filesystems/cdfs/CMakeLists.txt +++ b/reactos/drivers/filesystems/cdfs/CMakeLists.txt @@ -18,10 +18,7 @@ list(APPEND SOURCE cdfs.h) add_library(cdfs SHARED ${SOURCE} cdfs.rc) - set_module_type(cdfs kernelmodedriver) add_importlibs(cdfs ntoskrnl hal) - add_pch(cdfs cdfs.h SOURCE) - add_cd_file(TARGET cdfs DESTINATION reactos/system32/drivers NO_CAB FOR all) diff --git a/reactos/drivers/filesystems/fastfat/CMakeLists.txt b/reactos/drivers/filesystems/fastfat/CMakeLists.txt index 40f0988ac27..087f9e3f625 100644 --- a/reactos/drivers/filesystems/fastfat/CMakeLists.txt +++ b/reactos/drivers/filesystems/fastfat/CMakeLists.txt @@ -24,11 +24,8 @@ list(APPEND SOURCE vfat.h) add_library(fastfat SHARED ${SOURCE} vfatfs.rc) - set_module_type(fastfat kernelmodedriver) target_link_libraries(fastfat ${PSEH_LIB}) add_importlibs(fastfat ntoskrnl hal) - add_pch(fastfat vfat.h SOURCE) - add_cd_file(TARGET fastfat DESTINATION reactos/system32/drivers NO_CAB FOR all) diff --git a/reactos/drivers/filesystems/fastfat_new/CMakeLists.txt b/reactos/drivers/filesystems/fastfat_new/CMakeLists.txt index e25e5c853cc..eac55f29757 100644 --- a/reactos/drivers/filesystems/fastfat_new/CMakeLists.txt +++ b/reactos/drivers/filesystems/fastfat_new/CMakeLists.txt @@ -25,13 +25,7 @@ list(APPEND SOURCE fastfat.rc) add_library(fastfat_new SHARED ${SOURCE}) - set_module_type(fastfat_new kernelmodedriver) - -target_link_libraries(fastfat_new - ${PSEH_LIB} - fullfat) - +target_link_libraries(fastfat_new ${PSEH_LIB} fullfat) add_importlibs(fastfat_new ntoskrnl hal) - add_pch(fastfat_new fastfat.h) diff --git a/reactos/drivers/filesystems/msfs/CMakeLists.txt b/reactos/drivers/filesystems/msfs/CMakeLists.txt index 78782129a5e..350a2c61fba 100644 --- a/reactos/drivers/filesystems/msfs/CMakeLists.txt +++ b/reactos/drivers/filesystems/msfs/CMakeLists.txt @@ -8,10 +8,7 @@ list(APPEND SOURCE msfs.h) add_library(msfs SHARED ${SOURCE} msfs.rc) - set_module_type(msfs kernelmodedriver) add_importlibs(msfs ntoskrnl hal) - add_pch(msfs msfs.h SOURCE) - add_cd_file(TARGET msfs DESTINATION reactos/system32/drivers FOR all) diff --git a/reactos/drivers/filesystems/ntfs/CMakeLists.txt b/reactos/drivers/filesystems/ntfs/CMakeLists.txt index ed4875ff2d4..707f99d3023 100644 --- a/reactos/drivers/filesystems/ntfs/CMakeLists.txt +++ b/reactos/drivers/filesystems/ntfs/CMakeLists.txt @@ -18,10 +18,7 @@ list(APPEND SOURCE ntfs.h) add_library(ntfs SHARED ${SOURCE} ntfs.rc) - set_module_type(ntfs kernelmodedriver) add_importlibs(ntfs ntoskrnl hal) - add_pch(ntfs ntfs.h SOURCE) - add_cd_file(TARGET ntfs DESTINATION reactos/system32/drivers NO_CAB FOR all) diff --git a/reactos/drivers/filters/mountmgr/CMakeLists.txt b/reactos/drivers/filters/mountmgr/CMakeLists.txt index ab904927128..218d908f7a7 100644 --- a/reactos/drivers/filters/mountmgr/CMakeLists.txt +++ b/reactos/drivers/filters/mountmgr/CMakeLists.txt @@ -15,4 +15,3 @@ set_module_type(mountmgr kernelmodedriver) add_importlibs(mountmgr ntoskrnl hal) add_pch(mountmgr mntmgr.h SOURCE) add_cd_file(TARGET mountmgr DESTINATION reactos/system32/drivers NO_CAB FOR all) - diff --git a/reactos/drivers/hid/hidclass/CMakeLists.txt b/reactos/drivers/hid/hidclass/CMakeLists.txt index d23d5992af0..a9e53004aba 100644 --- a/reactos/drivers/hid/hidclass/CMakeLists.txt +++ b/reactos/drivers/hid/hidclass/CMakeLists.txt @@ -14,7 +14,6 @@ add_library(hidclass SHARED ${CMAKE_CURRENT_BINARY_DIR}/hidclass.def) set_module_type(hidclass kernelmodedriver ENTRYPOINT 0) - add_importlibs(hidclass ntoskrnl hidparse hal) add_pch(hidclass precomp.h SOURCE) add_cd_file(TARGET hidclass DESTINATION reactos/system32/drivers NO_CAB FOR all) diff --git a/reactos/drivers/hid/hidparse/CMakeLists.txt b/reactos/drivers/hid/hidparse/CMakeLists.txt index 3b5f9294804..1c23d7dd7ce 100644 --- a/reactos/drivers/hid/hidparse/CMakeLists.txt +++ b/reactos/drivers/hid/hidparse/CMakeLists.txt @@ -8,10 +8,7 @@ include_directories( add_library(hidparse SHARED hidparse.c hidparse.rc ${CMAKE_CURRENT_BINARY_DIR}/hidparse.def) - set_module_type(hidparse kernelmodedriver) add_importlibs(hidparse ntoskrnl) - target_link_libraries(hidparse hidparser) - add_cd_file(TARGET hidparse DESTINATION reactos/system32/drivers NO_CAB FOR all) diff --git a/reactos/drivers/hid/hidusb/CMakeLists.txt b/reactos/drivers/hid/hidusb/CMakeLists.txt index 349abc855c9..9ec04ea5f91 100644 --- a/reactos/drivers/hid/hidusb/CMakeLists.txt +++ b/reactos/drivers/hid/hidusb/CMakeLists.txt @@ -4,8 +4,6 @@ list(APPEND SOURCE hidusb.rc) add_library(hidusb SHARED ${SOURCE}) - set_module_type(hidusb kernelmodedriver) add_importlibs(hidusb hidclass ntoskrnl usbd hal) - add_cd_file(TARGET hidusb DESTINATION reactos/system32/drivers NO_CAB FOR all) diff --git a/reactos/drivers/hid/kbdhid/CMakeLists.txt b/reactos/drivers/hid/kbdhid/CMakeLists.txt index f8667efae35..7a5f48e1340 100644 --- a/reactos/drivers/hid/kbdhid/CMakeLists.txt +++ b/reactos/drivers/hid/kbdhid/CMakeLists.txt @@ -1,11 +1,7 @@ add_definitions(-DDEBUG_MODE) - include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - add_library(kbdhid SHARED kbdhid.c kbdhid.rc) - set_module_type(kbdhid kernelmodedriver) add_importlibs(kbdhid ntoskrnl hal hidparse) - add_cd_file(TARGET kbdhid DESTINATION reactos/system32/drivers NO_CAB FOR all) diff --git a/reactos/drivers/hid/mouhid/CMakeLists.txt b/reactos/drivers/hid/mouhid/CMakeLists.txt index e0ba3960dd4..6a7e7349fb3 100644 --- a/reactos/drivers/hid/mouhid/CMakeLists.txt +++ b/reactos/drivers/hid/mouhid/CMakeLists.txt @@ -1,11 +1,7 @@ add_definitions(-DDEBUG_MODE) - include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - add_library(mouhid SHARED mouhid.c mouhid.rc) - set_module_type(mouhid kernelmodedriver) add_importlibs(mouhid ntoskrnl hal hidparse) - add_cd_file(TARGET mouhid DESTINATION reactos/system32/drivers FOR all) diff --git a/reactos/drivers/ksfilter/ks/CMakeLists.txt b/reactos/drivers/ksfilter/ks/CMakeLists.txt index e0a6629e111..7a79f9f678a 100644 --- a/reactos/drivers/ksfilter/ks/CMakeLists.txt +++ b/reactos/drivers/ksfilter/ks/CMakeLists.txt @@ -47,4 +47,3 @@ add_pch(ks precomp.h SOURCE) add_importlibs(ks ntoskrnl hal) add_dependencies(ks psdk) add_cd_file(TARGET ks DESTINATION reactos/system32/drivers FOR all) - diff --git a/reactos/drivers/ksfilter/swenum/CMakeLists.txt b/reactos/drivers/ksfilter/swenum/CMakeLists.txt index d9311417631..cf8b33a0964 100644 --- a/reactos/drivers/ksfilter/swenum/CMakeLists.txt +++ b/reactos/drivers/ksfilter/swenum/CMakeLists.txt @@ -1,10 +1,5 @@ -list(APPEND SOURCE - swenum.c) - -add_library(swenum SHARED ${SOURCE}) - +add_library(swenum SHARED swenum.c) set_module_type(swenum kernelmodedriver) add_importlibs(swenum ks ntoskrnl hal) - add_cd_file(TARGET swenum DESTINATION reactos/system32/drivers NO_CAB FOR all) diff --git a/reactos/drivers/network/afd/CMakeLists.txt b/reactos/drivers/network/afd/CMakeLists.txt index 4776226f573..ae1a2db1dc7 100644 --- a/reactos/drivers/network/afd/CMakeLists.txt +++ b/reactos/drivers/network/afd/CMakeLists.txt @@ -20,7 +20,6 @@ list(APPEND SOURCE add_library(afd SHARED ${SOURCE} afd.rc) target_link_libraries(afd ${PSEH_LIB}) - set_module_type(afd kernelmodedriver) add_importlibs(afd ntoskrnl hal) add_pch(afd include/afd.h SOURCE) diff --git a/reactos/drivers/network/ndis/CMakeLists.txt b/reactos/drivers/network/ndis/CMakeLists.txt index 3a81a64f245..f338362d125 100644 --- a/reactos/drivers/network/ndis/CMakeLists.txt +++ b/reactos/drivers/network/ndis/CMakeLists.txt @@ -1,5 +1,6 @@ include_directories(BEFORE include) +spec2def(ndis.sys ndis.spec ADD_IMPORTLIB) add_definitions( -DNDIS_WRAPPER @@ -10,8 +11,6 @@ add_definitions( -DNDIS_LEGACY_PROTOCOL -DNDIS_MINIPORT_DRIVER) -spec2def(ndis.sys ndis.spec ADD_IMPORTLIB) - list(APPEND SOURCE ndis/30stubs.c ndis/40stubs.c @@ -41,8 +40,5 @@ add_library(ndis SHARED set_module_type(ndis kernelmodedriver) add_importlibs(ndis ntoskrnl hal) - add_pch(ndis include/ndissys.h SOURCE) - add_cd_file(TARGET ndis DESTINATION reactos/system32/drivers FOR all) - diff --git a/reactos/drivers/network/ndisuio/CMakeLists.txt b/reactos/drivers/network/ndisuio/CMakeLists.txt index 5fd566b3e29..1f9e8946be1 100644 --- a/reactos/drivers/network/ndisuio/CMakeLists.txt +++ b/reactos/drivers/network/ndisuio/CMakeLists.txt @@ -1,3 +1,4 @@ + add_definitions( -DNDIS50 -D_NTDRIVER_) diff --git a/reactos/drivers/network/tcpip/CMakeLists.txt b/reactos/drivers/network/tcpip/CMakeLists.txt index 5a8230a8e9c..c29acaf9214 100644 --- a/reactos/drivers/network/tcpip/CMakeLists.txt +++ b/reactos/drivers/network/tcpip/CMakeLists.txt @@ -32,15 +32,8 @@ add_library(tcpip SHARED tcpip.rc ${CMAKE_CURRENT_BINARY_DIR}/tcpip.def) -target_link_libraries(tcpip - ip - lwip - ${PSEH_LIB} - chew) - +target_link_libraries(tcpip ip lwip ${PSEH_LIB} chew) set_module_type(tcpip kernelmodedriver) add_importlibs(tcpip ndis ntoskrnl hal) - add_pch(tcpip include/precomp.h SOURCE) - add_cd_file(TARGET tcpip DESTINATION reactos/system32/drivers FOR all) diff --git a/reactos/drivers/parallel/parallel/CMakeLists.txt b/reactos/drivers/parallel/parallel/CMakeLists.txt index 95444961590..e263fa16718 100644 --- a/reactos/drivers/parallel/parallel/CMakeLists.txt +++ b/reactos/drivers/parallel/parallel/CMakeLists.txt @@ -1,5 +1,4 @@ add_library(parallel SHARED parallel.c parallel.rc) - set_module_type(parallel kernelmodedriver) add_importlibs(parallel ntoskrnl hal) diff --git a/reactos/drivers/storage/class/cdrom/CMakeLists.txt b/reactos/drivers/storage/class/cdrom/CMakeLists.txt index 2f335653ccb..8ab07f20d63 100644 --- a/reactos/drivers/storage/class/cdrom/CMakeLists.txt +++ b/reactos/drivers/storage/class/cdrom/CMakeLists.txt @@ -7,13 +7,7 @@ list(APPEND SOURCE precomp.h) add_library(cdrom SHARED ${SOURCE} cdrom.rc) - set_module_type(cdrom kernelmodedriver) -add_importlibs(cdrom - class2 - scsiport - ntoskrnl - hal) - +add_importlibs(cdrom class2 scsiport ntoskrnl hal) add_pch(cdrom precomp.h SOURCE) add_cd_file(TARGET cdrom DESTINATION reactos/system32/drivers NO_CAB FOR all) diff --git a/reactos/drivers/storage/class/cdrom_new/CMakeLists.txt b/reactos/drivers/storage/class/cdrom_new/CMakeLists.txt index 1c425b6c01d..d4d0853280d 100644 --- a/reactos/drivers/storage/class/cdrom_new/CMakeLists.txt +++ b/reactos/drivers/storage/class/cdrom_new/CMakeLists.txt @@ -10,15 +10,12 @@ list(APPEND SOURCE cdrom.h) add_library(cdrom_new SHARED ${SOURCE}) - target_link_libraries(cdrom_new libcntpr wdmguid) -if(ARCH STREQUAL "i386") +if((ARCH STREQUAL "i386") AND (NOT MSVC)) # FIXME: http://www.cmake.org/Bug/view.php?id=12998 - if(NOT MSVC) - #add_target_compile_flags(cdrom_new "-Wno-format -Wno-unused-variable -Wno-pointer-sign") - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-format -Wno-unused-variable -Wno-pointer-sign") - endif() + #add_target_compile_flags(cdrom_new "-Wno-format -Wno-unused-variable -Wno-pointer-sign") + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-format -Wno-unused-variable -Wno-pointer-sign") endif() set_module_type(cdrom_new kernelmodedriver) diff --git a/reactos/drivers/storage/class/class2/CMakeLists.txt b/reactos/drivers/storage/class/class2/CMakeLists.txt index d17def7f987..fa298def3b4 100644 --- a/reactos/drivers/storage/class/class2/CMakeLists.txt +++ b/reactos/drivers/storage/class/class2/CMakeLists.txt @@ -1,6 +1,5 @@ include_directories(..) - spec2def(class2.sys class2.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -9,10 +8,6 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/class2.def) add_library(class2 SHARED ${SOURCE}) - set_module_type(class2 kernelmodedriver) - add_importlibs(class2 scsiport ntoskrnl hal) - - add_cd_file(TARGET class2 DESTINATION reactos/system32/drivers NO_CAB FOR all) diff --git a/reactos/drivers/storage/class/disk/CMakeLists.txt b/reactos/drivers/storage/class/disk/CMakeLists.txt index dcddd4f2aaa..e288906eaeb 100644 --- a/reactos/drivers/storage/class/disk/CMakeLists.txt +++ b/reactos/drivers/storage/class/disk/CMakeLists.txt @@ -1,13 +1,6 @@ include_directories(..) - add_library(disk SHARED disk.c disk.rc) - set_module_type(disk kernelmodedriver) -add_importlibs(disk - class2 - scsiport - ntoskrnl - hal) - +add_importlibs(disk class2 scsiport ntoskrnl hal) add_cd_file(TARGET disk DESTINATION reactos/system32/drivers NO_CAB FOR all) diff --git a/reactos/drivers/storage/class/disk_new/CMakeLists.txt b/reactos/drivers/storage/class/disk_new/CMakeLists.txt index 61e15dc78c5..c210c5c754e 100644 --- a/reactos/drivers/storage/class/disk_new/CMakeLists.txt +++ b/reactos/drivers/storage/class/disk_new/CMakeLists.txt @@ -1,3 +1,4 @@ + include_directories(..) list(APPEND SOURCE @@ -11,14 +12,12 @@ list(APPEND SOURCE disk.h) add_library(disk_new SHARED ${SOURCE} disk.rc) - target_link_libraries(disk_new libcntpr wdmguid) -if(ARCH STREQUAL "i386") + +if((ARCH STREQUAL "i386") AND (NOT MSVC)) # FIXME: http://www.cmake.org/Bug/view.php?id=12998 - if(NOT MSVC) - #add_target_compile_flags(disk_new "-Wno-error -Wno-format -Wno-pointer-sign") - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error -Wno-format -Wno-pointer-sign") - endif() + #add_target_compile_flags(disk_new "-Wno-error -Wno-format -Wno-pointer-sign") + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error -Wno-format -Wno-pointer-sign") endif() set_module_type(disk_new kernelmodedriver) diff --git a/reactos/drivers/storage/class/ramdisk/CMakeLists.txt b/reactos/drivers/storage/class/ramdisk/CMakeLists.txt index f6cee2bfe72..aac700cbbff 100644 --- a/reactos/drivers/storage/class/ramdisk/CMakeLists.txt +++ b/reactos/drivers/storage/class/ramdisk/CMakeLists.txt @@ -1,11 +1,6 @@ include_directories(..) - add_library(ramdisk SHARED ramdisk.c ramdisk.rc) - set_module_type(ramdisk kernelmodedriver) -add_importlibs(ramdisk - ntoskrnl - hal) - +add_importlibs(ramdisk ntoskrnl hal) add_cd_file(TARGET ramdisk DESTINATION reactos/system32/drivers NO_CAB FOR all) diff --git a/reactos/drivers/storage/classpnp/CMakeLists.txt b/reactos/drivers/storage/classpnp/CMakeLists.txt index 69cfd3725aa..47846cf03b2 100644 --- a/reactos/drivers/storage/classpnp/CMakeLists.txt +++ b/reactos/drivers/storage/classpnp/CMakeLists.txt @@ -1,5 +1,6 @@ include_directories(../inc) +spec2def(classpnp.sys classpnp.spec ADD_IMPORTLIB) add_definitions( -DCLASS_GLOBAL_BREAK_ON_LOST_IRPS=0 @@ -9,8 +10,6 @@ add_definitions( -DCLASS_GLOBAL_BUFFERED_DEBUG_PRINT_BUFFER_SIZE=512 -DCLASS_GLOBAL_BUFFERED_DEBUG_PRINT_BUFFERS=512) -spec2def(classpnp.sys classpnp.spec ADD_IMPORTLIB) - list(APPEND SOURCE autorun.c class.c @@ -34,16 +33,13 @@ add_library(classpnp SHARED class.rc ${CMAKE_CURRENT_BINARY_DIR}/classpnp.def) -if(ARCH STREQUAL "i386") +if((ARCH STREQUAL "i386") AND (NOT MSVC)) # FIXME: http://www.cmake.org/Bug/view.php?id=12998 - if(NOT MSVC) - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error=unused-but-set-variable -Wno-error=unused-variable -Wno-error=switch") - endif() + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error=unused-but-set-variable -Wno-error=unused-variable -Wno-error=switch") endif() add_pch(classpnp classp.h SOURCE) target_link_libraries(classpnp ${PSEH_LIB} libcntpr) set_module_type(classpnp kernelmodedriver) add_importlibs(classpnp hal ntoskrnl) - add_cd_file(TARGET classpnp DESTINATION reactos/system32/drivers NO_CAB FOR all) diff --git a/reactos/drivers/storage/ide/atapi/CMakeLists.txt b/reactos/drivers/storage/ide/atapi/CMakeLists.txt index 73c2c8a0eef..0e1902a09f4 100644 --- a/reactos/drivers/storage/ide/atapi/CMakeLists.txt +++ b/reactos/drivers/storage/ide/atapi/CMakeLists.txt @@ -1,9 +1,6 @@ add_library(atapi SHARED atapi.c atapi.rc) - target_link_libraries(atapi libcntpr) - set_module_type(atapi kernelmodedriver) add_importlibs(atapi scsiport) - add_cd_file(TARGET atapi DESTINATION reactos/system32/drivers NO_CAB FOR all) diff --git a/reactos/drivers/storage/ide/pciide/CMakeLists.txt b/reactos/drivers/storage/ide/pciide/CMakeLists.txt index 89efccdf7c4..ebbe776f268 100644 --- a/reactos/drivers/storage/ide/pciide/CMakeLists.txt +++ b/reactos/drivers/storage/ide/pciide/CMakeLists.txt @@ -1,7 +1,5 @@ add_library(pciide SHARED pciide.c pciide.rc) - set_module_type(pciide kernelmodedriver) add_importlibs(pciide pciidex ntoskrnl) - add_cd_file(TARGET pciide DESTINATION reactos/system32/drivers NO_CAB FOR all) diff --git a/reactos/drivers/storage/ide/pciidex/CMakeLists.txt b/reactos/drivers/storage/ide/pciidex/CMakeLists.txt index d26e48e8891..c31405b78a0 100644 --- a/reactos/drivers/storage/ide/pciidex/CMakeLists.txt +++ b/reactos/drivers/storage/ide/pciidex/CMakeLists.txt @@ -18,4 +18,3 @@ add_pch(pciidex pciidex.h SOURCE) set_module_type(pciidex kernelmodedriver) add_importlibs(pciidex ntoskrnl) add_cd_file(TARGET pciidex 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 922d18e7a11..49111be670b 100644 --- a/reactos/drivers/storage/ide/uniata/CMakeLists.txt +++ b/reactos/drivers/storage/ide/uniata/CMakeLists.txt @@ -20,7 +20,6 @@ list(APPEND SOURCE add_library(uniata SHARED ${SOURCE} idedma.rc) - if(NOT MSVC) add_target_compile_flags(uniata "-Wno-narrowing") if(NOT CMAKE_C_COMPILER_ID STREQUAL "Clang") diff --git a/reactos/drivers/storage/scsiport/CMakeLists.txt b/reactos/drivers/storage/scsiport/CMakeLists.txt index 6ab1a4945c0..339e84faeac 100644 --- a/reactos/drivers/storage/scsiport/CMakeLists.txt +++ b/reactos/drivers/storage/scsiport/CMakeLists.txt @@ -14,5 +14,4 @@ add_library(scsiport SHARED add_pch(scsiport precomp.h SOURCE) set_module_type(scsiport kernelmodedriver) add_importlibs(scsiport ntoskrnl hal) - add_cd_file(TARGET scsiport DESTINATION reactos/system32/drivers NO_CAB FOR all) diff --git a/reactos/drivers/usb/usbccgp/CMakeLists.txt b/reactos/drivers/usb/usbccgp/CMakeLists.txt index 15eab5b124a..92a8ae0a7cf 100644 --- a/reactos/drivers/usb/usbccgp/CMakeLists.txt +++ b/reactos/drivers/usb/usbccgp/CMakeLists.txt @@ -1,9 +1,8 @@ + remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) - add_definitions(-DDEBUG_MODE) - include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) list(APPEND SOURCE @@ -21,7 +20,6 @@ add_library(usbccgp SHARED usbccgp.rc) target_link_libraries(usbccgp ${PSEH_LIB}) - set_module_type(usbccgp kernelmodedriver) add_importlibs(usbccgp ntoskrnl hal usbd) add_pch(usbccgp usbccgp.h SOURCE) diff --git a/reactos/drivers/usb/usbd/CMakeLists.txt b/reactos/drivers/usb/usbd/CMakeLists.txt index 993f1d053c2..aaccade8a3b 100644 --- a/reactos/drivers/usb/usbd/CMakeLists.txt +++ b/reactos/drivers/usb/usbd/CMakeLists.txt @@ -8,6 +8,4 @@ add_library(usbd SHARED set_module_type(usbd kernelmodedriver) add_importlibs(usbd ntoskrnl hal) - - add_cd_file(TARGET usbd DESTINATION reactos/system32/drivers NO_CAB FOR all) diff --git a/reactos/drivers/usb/usbehci/CMakeLists.txt b/reactos/drivers/usb/usbehci/CMakeLists.txt index 8f1e50d498f..aed4b1588f1 100644 --- a/reactos/drivers/usb/usbehci/CMakeLists.txt +++ b/reactos/drivers/usb/usbehci/CMakeLists.txt @@ -18,12 +18,7 @@ add_library(usbehci SHARED guid.cpp usbehci.rc) -target_link_libraries(usbehci - uuid - libusb - libcntpr - ${PSEH_LIB}) - +target_link_libraries(usbehci uuid libusb libcntpr ${PSEH_LIB}) set_module_type(usbehci kernelmodedriver) add_importlibs(usbehci ntoskrnl hal usbd) add_pch(usbehci usbehci.h SOURCE) diff --git a/reactos/drivers/usb/usbhub/CMakeLists.txt b/reactos/drivers/usb/usbhub/CMakeLists.txt index 5aa3ec798d3..2a8224d08cf 100644 --- a/reactos/drivers/usb/usbhub/CMakeLists.txt +++ b/reactos/drivers/usb/usbhub/CMakeLists.txt @@ -1,6 +1,5 @@ add_definitions(-DDEBUG_MODE) - include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) list(APPEND SOURCE @@ -17,7 +16,6 @@ add_library(usbhub SHARED usbhub.rc) target_link_libraries(usbhub ${PSEH_LIB}) - set_module_type(usbhub kernelmodedriver) add_importlibs(usbhub ntoskrnl hal usbd) add_pch(usbhub usbhub.h SOURCE) diff --git a/reactos/drivers/usb/usbohci/CMakeLists.txt b/reactos/drivers/usb/usbohci/CMakeLists.txt index 53b05f4f29c..83aa2e38e6b 100644 --- a/reactos/drivers/usb/usbohci/CMakeLists.txt +++ b/reactos/drivers/usb/usbohci/CMakeLists.txt @@ -18,12 +18,7 @@ add_library(usbohci SHARED guid.cpp usbohci.rc) -target_link_libraries(usbohci - uuid - libusb - libcntpr - ${PSEH_LIB}) - +target_link_libraries(usbohci uuid libusb libcntpr ${PSEH_LIB}) set_module_type(usbohci kernelmodedriver) add_importlibs(usbohci ntoskrnl hal usbd) add_pch(usbohci usbohci.h SOURCE) diff --git a/reactos/drivers/usb/usbstor/CMakeLists.txt b/reactos/drivers/usb/usbstor/CMakeLists.txt index 47881948b57..3bb2eed0f25 100644 --- a/reactos/drivers/usb/usbstor/CMakeLists.txt +++ b/reactos/drivers/usb/usbstor/CMakeLists.txt @@ -1,6 +1,5 @@ add_definitions(-DDEBUG_MODE) - include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) list(APPEND SOURCE diff --git a/reactos/drivers/usb/usbuhci/CMakeLists.txt b/reactos/drivers/usb/usbuhci/CMakeLists.txt index 3ca8ffaa9d3..9decd89fc70 100644 --- a/reactos/drivers/usb/usbuhci/CMakeLists.txt +++ b/reactos/drivers/usb/usbuhci/CMakeLists.txt @@ -4,8 +4,7 @@ set_cpp() remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) -include_directories( - ${REACTOS_SOURCE_DIR}/lib/drivers/libusb) +include_directories(${REACTOS_SOURCE_DIR}/lib/drivers/libusb) list(APPEND SOURCE usbuhci.cpp @@ -19,12 +18,7 @@ add_library(usbuhci SHARED guid.cpp usbuhci.rc) -target_link_libraries(usbuhci - uuid - libusb - libcntpr - ${PSEH_LIB}) - +target_link_libraries(usbuhci uuid libusb libcntpr ${PSEH_LIB}) set_module_type(usbuhci kernelmodedriver) add_importlibs(usbuhci ntoskrnl hal usbd) add_pch(usbuhci usbuhci.h SOURCE) diff --git a/reactos/drivers/wdm/audio/backpln/audio_test/CMakeLists.txt b/reactos/drivers/wdm/audio/backpln/audio_test/CMakeLists.txt index ec4b43a546d..a1a46b0ec3e 100644 --- a/reactos/drivers/wdm/audio/backpln/audio_test/CMakeLists.txt +++ b/reactos/drivers/wdm/audio/backpln/audio_test/CMakeLists.txt @@ -7,10 +7,7 @@ include_directories( ${REACTOS_SOURCE_DIR}/lib/3rdparty/libsamplerate) add_executable(audio_test audio_test.c) - set_module_type(audio_test win32cui) - target_link_libraries(audio_test libsamplerate) - add_importlibs(audio_test setupapi ksuser msvcrt kernel32) add_dependencies(audio_test bugcodes) diff --git a/reactos/drivers/wdm/audio/backpln/portcls/CMakeLists.txt b/reactos/drivers/wdm/audio/backpln/portcls/CMakeLists.txt index a9a333830ae..e5f07047763 100644 --- a/reactos/drivers/wdm/audio/backpln/portcls/CMakeLists.txt +++ b/reactos/drivers/wdm/audio/backpln/portcls/CMakeLists.txt @@ -55,10 +55,7 @@ add_library(portcls SHARED portcls.rc ${CMAKE_CURRENT_BINARY_DIR}/portcls.def) -target_link_libraries(portcls - libcntpr - ${PSEH_LIB}) - +target_link_libraries(portcls libcntpr ${PSEH_LIB}) set_module_type(portcls kernelmodedriver ENTRYPOINT 0 ) add_pch(portcls private.hpp SOURCE) add_importlibs(portcls ntoskrnl ks drmk hal) diff --git a/reactos/drivers/wdm/audio/drivers/CMIDriver/CMakeLists.txt b/reactos/drivers/wdm/audio/drivers/CMIDriver/CMakeLists.txt index c0c67fd4e85..550716b77e8 100644 --- a/reactos/drivers/wdm/audio/drivers/CMIDriver/CMakeLists.txt +++ b/reactos/drivers/wdm/audio/drivers/CMIDriver/CMakeLists.txt @@ -21,9 +21,7 @@ add_library(cmipci SHARED cmipci.rc) target_link_libraries(cmipci stdunk libcntpr uuid) - set_module_type(cmipci wdmdriver UNICODE) - add_importlibs(cmipci portcls hal ntoskrnl) if(NOT MSVC) @@ -35,6 +33,7 @@ endif() add_pch(cmipci precomp.h SOURCE) add_cd_file(TARGET cmipci DESTINATION reactos/system32/drivers FOR all) + if(ARCH STREQUAL "i386") add_cd_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/CM8738-x32.inf" DESTINATION reactos/inf FOR all) else() diff --git a/reactos/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/CMakeLists.txt b/reactos/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/CMakeLists.txt index a60725aa05a..aeff43e3db7 100644 --- a/reactos/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/CMakeLists.txt +++ b/reactos/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/CMakeLists.txt @@ -1,29 +1,13 @@ set_cpp() - include_directories(..) -add_executable(cmicontrol - main.cpp - window.rc) +add_executable(cmicontrol main.cpp window.rc) if(NOT MSVC) set_source_files_properties(main.cpp PROPERTIES COMPILE_FLAGS "-Wno-write-strings") endif() -add_importlibs(cmicontrol - user32 - gdi32 - ole32 - advapi32 - comctl32 - shell32 - dsound - setupapi - winmm - msvcrt - kernel32) - +add_importlibs(cmicontrol user32 gdi32 ole32 advapi32 comctl32 shell32 dsound setupapi winmm msvcrt kernel32) set_module_type(cmicontrol win32gui) - add_cd_file(TARGET cmicontrol DESTINATION reactos/system32/drivers FOR all) diff --git a/reactos/drivers/wdm/audio/drm/drmk/CMakeLists.txt b/reactos/drivers/wdm/audio/drm/drmk/CMakeLists.txt index 3e575393812..a393407c729 100644 --- a/reactos/drivers/wdm/audio/drm/drmk/CMakeLists.txt +++ b/reactos/drivers/wdm/audio/drm/drmk/CMakeLists.txt @@ -1,6 +1,5 @@ add_definitions(-DBUILDING_DRMK) - spec2def(drmk.sys drmk.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -9,9 +8,6 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/drmk.def) add_library(drmk SHARED ${SOURCE}) - set_module_type(drmk kernelmodedriver ENTRYPOINT 0) - add_importlibs(drmk ntoskrnl) - add_cd_file(TARGET drmk DESTINATION reactos/system32/drivers FOR all) diff --git a/reactos/drivers/wdm/audio/filters/kmixer/CMakeLists.txt b/reactos/drivers/wdm/audio/filters/kmixer/CMakeLists.txt index 16d22f65428..feba177426f 100644 --- a/reactos/drivers/wdm/audio/filters/kmixer/CMakeLists.txt +++ b/reactos/drivers/wdm/audio/filters/kmixer/CMakeLists.txt @@ -9,11 +9,7 @@ list(APPEND SOURCE add_library(kmixer SHARED ${SOURCE}) set_module_type(kmixer kernelmodedriver) - -target_link_libraries(kmixer - libcntpr - libsamplerate) - +target_link_libraries(kmixer libcntpr libsamplerate) add_pch(kmixer kmixer.h SOURCE) add_importlibs(kmixer ntoskrnl ks hal) add_cd_file(TARGET kmixer DESTINATION reactos/system32/drivers FOR all) diff --git a/reactos/drivers/wdm/audio/legacy/wdmaud/CMakeLists.txt b/reactos/drivers/wdm/audio/legacy/wdmaud/CMakeLists.txt index b4ccdd062d1..0716b07449d 100644 --- a/reactos/drivers/wdm/audio/legacy/wdmaud/CMakeLists.txt +++ b/reactos/drivers/wdm/audio/legacy/wdmaud/CMakeLists.txt @@ -15,11 +15,7 @@ list(APPEND SOURCE add_library(wdmaud SHARED ${SOURCE} wdmaud.rc) set_module_type(wdmaud kernelmodedriver) - -target_link_libraries(wdmaud - mmixer - libcntpr) - +target_link_libraries(wdmaud mmixer libcntpr) add_pch(wdmaud wdmaud.h SOURCE) add_importlibs(wdmaud ntoskrnl ks hal) add_cd_file(TARGET wdmaud DESTINATION reactos/system32/drivers FOR all) diff --git a/reactos/drivers/wmi/CMakeLists.txt b/reactos/drivers/wmi/CMakeLists.txt index 35f19842bab..8d6212634d4 100644 --- a/reactos/drivers/wmi/CMakeLists.txt +++ b/reactos/drivers/wmi/CMakeLists.txt @@ -7,9 +7,6 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/wmilib.def) add_library(wmilib SHARED ${SOURCE}) - set_module_type(wmilib kernelmodedriver ENTRYPOINT 0) - add_importlibs(wmilib ntoskrnl) - add_cd_file(TARGET wmilib DESTINATION reactos/system32/drivers NO_CAB FOR all) diff --git a/reactos/lib/3rdparty/bzip2/CMakeLists.txt b/reactos/lib/3rdparty/bzip2/CMakeLists.txt index 17126984bfa..e65eba0084b 100644 --- a/reactos/lib/3rdparty/bzip2/CMakeLists.txt +++ b/reactos/lib/3rdparty/bzip2/CMakeLists.txt @@ -1,6 +1,5 @@ add_definitions(-DBZ_NO_STDIO -DBZ_DECOMPRESS_ONLY) - spec2def(unbzip2.sys unbzip2.spec) list(APPEND SOURCE diff --git a/reactos/lib/3rdparty/zlib/CMakeLists.txt b/reactos/lib/3rdparty/zlib/CMakeLists.txt index ae4b1325499..0abf4199263 100644 --- a/reactos/lib/3rdparty/zlib/CMakeLists.txt +++ b/reactos/lib/3rdparty/zlib/CMakeLists.txt @@ -1,6 +1,5 @@ add_definitions(-DNO_VIZ) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/zlib) list(APPEND SOURCE diff --git a/reactos/lib/atl/CMakeLists.txt b/reactos/lib/atl/CMakeLists.txt index 031ce279d62..f0177d597f7 100644 --- a/reactos/lib/atl/CMakeLists.txt +++ b/reactos/lib/atl/CMakeLists.txt @@ -7,4 +7,3 @@ add_definitions( add_library(atlnew atlbase.cpp atlcore.cpp) add_dependencies(atlnew psdk) - diff --git a/reactos/lib/cryptlib/CMakeLists.txt b/reactos/lib/cryptlib/CMakeLists.txt index e2f4a17b2f5..71a65627485 100644 --- a/reactos/lib/cryptlib/CMakeLists.txt +++ b/reactos/lib/cryptlib/CMakeLists.txt @@ -7,5 +7,4 @@ add_library(cryptlib mvAesAlg.c rc4.c sha1.c - util.c -) + util.c) diff --git a/reactos/lib/dnslib/CMakeLists.txt b/reactos/lib/dnslib/CMakeLists.txt index eae9061928a..5bd869f090b 100644 --- a/reactos/lib/dnslib/CMakeLists.txt +++ b/reactos/lib/dnslib/CMakeLists.txt @@ -1,6 +1,5 @@ include_directories(inc) - add_definitions(-DUNICODE -D_UNICODE) list(APPEND SOURCE diff --git a/reactos/lib/drivers/libusb/CMakeLists.txt b/reactos/lib/drivers/libusb/CMakeLists.txt index 98021eba69a..742e2d5bc82 100644 --- a/reactos/lib/drivers/libusb/CMakeLists.txt +++ b/reactos/lib/drivers/libusb/CMakeLists.txt @@ -4,9 +4,7 @@ set_cpp() remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) - -add_definitions( - -DUNICODE -D_UNICODE) +add_definitions(-DUNICODE -D_UNICODE) list(APPEND SOURCE hcd_controller.cpp diff --git a/reactos/lib/drivers/lwip/CMakeLists.txt b/reactos/lib/drivers/lwip/CMakeLists.txt index 37521e3c8f0..4095b863131 100644 --- a/reactos/lib/drivers/lwip/CMakeLists.txt +++ b/reactos/lib/drivers/lwip/CMakeLists.txt @@ -1,3 +1,4 @@ + include_directories( BEFORE include ${REACTOS_SOURCE_DIR}/drivers/network/tcpip/include @@ -60,6 +61,7 @@ list(APPEND SOURCE add_library(lwip ${SOURCE}) add_dependencies(lwip bugcodes) add_pch(lwip precomp.h SOURCE) + if(NOT MSVC) if(LTCG) add_compile_flags("-fno-builtin-malloc -fno-builtin-free") diff --git a/reactos/lib/drivers/sound/libusbaudio/CMakeLists.txt b/reactos/lib/drivers/sound/libusbaudio/CMakeLists.txt index 9e4851fef75..1693c574838 100644 --- a/reactos/lib/drivers/sound/libusbaudio/CMakeLists.txt +++ b/reactos/lib/drivers/sound/libusbaudio/CMakeLists.txt @@ -10,4 +10,3 @@ list(APPEND SOURCE add_library(libusbaudio ${SOURCE}) add_dependencies(libusbaudio bugcodes) - diff --git a/reactos/lib/drivers/sound/mmixer/CMakeLists.txt b/reactos/lib/drivers/sound/mmixer/CMakeLists.txt index 9c972a6334f..91c9ab2810b 100644 --- a/reactos/lib/drivers/sound/mmixer/CMakeLists.txt +++ b/reactos/lib/drivers/sound/mmixer/CMakeLists.txt @@ -18,4 +18,3 @@ list(APPEND SOURCE add_library(mmixer ${SOURCE}) add_pch(mmixer precomp.h SOURCE) add_dependencies(mmixer bugcodes) - diff --git a/reactos/lib/drivers/sound/stdunk/CMakeLists.txt b/reactos/lib/drivers/sound/stdunk/CMakeLists.txt index 9a19e7f7d19..e2d54dd5f30 100644 --- a/reactos/lib/drivers/sound/stdunk/CMakeLists.txt +++ b/reactos/lib/drivers/sound/stdunk/CMakeLists.txt @@ -1,4 +1,3 @@ set_cpp() - -add_library(stdunk STATIC cunknown.cpp) +add_library(stdunk cunknown.cpp) diff --git a/reactos/lib/fslib/ntfslib/CMakeLists.txt b/reactos/lib/fslib/ntfslib/CMakeLists.txt index 77a14234e28..327ac811e84 100644 --- a/reactos/lib/fslib/ntfslib/CMakeLists.txt +++ b/reactos/lib/fslib/ntfslib/CMakeLists.txt @@ -1,4 +1,3 @@ add_library(ntfslib ntfslib.c) add_dependencies(ntfslib psdk) - diff --git a/reactos/lib/gcc_ssp/CMakeLists.txt b/reactos/lib/gcc_ssp/CMakeLists.txt index 389e6292204..a7556901e07 100644 --- a/reactos/lib/gcc_ssp/CMakeLists.txt +++ b/reactos/lib/gcc_ssp/CMakeLists.txt @@ -1,2 +1,2 @@ -add_library(gcc_ssp STATIC gcc_ssp.c) \ No newline at end of file +add_library(gcc_ssp gcc_ssp.c) diff --git a/reactos/lib/recyclebin/CMakeLists.txt b/reactos/lib/recyclebin/CMakeLists.txt index 009d09cd599..6a07441ec7e 100644 --- a/reactos/lib/recyclebin/CMakeLists.txt +++ b/reactos/lib/recyclebin/CMakeLists.txt @@ -10,4 +10,3 @@ list(APPEND SOURCE add_library(recyclebin ${SOURCE} guid.c) add_pch(recyclebin recyclebin_private.h SOURCE) add_dependencies(recyclebin psdk) - diff --git a/reactos/lib/sdk/RunTmChk/CMakeLists.txt b/reactos/lib/sdk/RunTmChk/CMakeLists.txt index 2e311e3a675..9ec1ac0474b 100644 --- a/reactos/lib/sdk/RunTmChk/CMakeLists.txt +++ b/reactos/lib/sdk/RunTmChk/CMakeLists.txt @@ -1,15 +1,10 @@ -list(APPEND SOURCE - rtcapi.c -) +list(APPEND SOURCE rtcapi.c) if(ARCH STREQUAL "i386") - list(APPEND ASM_SOURCE - i386/_RTC_CheckEsp.S -) + list(APPEND ASM_SOURCE i386/_RTC_CheckEsp.S) endif() add_asm_files(RunTmChk_asm ${ASM_SOURCE}) add_library(RunTmChk ${SOURCE} ${RunTmChk_asm}) - add_dependencies(RunTmChk asm) diff --git a/reactos/lib/sdk/comsupp/CMakeLists.txt b/reactos/lib/sdk/comsupp/CMakeLists.txt index 0232dfb4682..52b78314817 100644 --- a/reactos/lib/sdk/comsupp/CMakeLists.txt +++ b/reactos/lib/sdk/comsupp/CMakeLists.txt @@ -1,5 +1,4 @@ set_cpp(WITH_EXCEPTIONS WITH_STL) - add_library(comsupp comsupp.cpp) add_dependencies(comsupp psdk) diff --git a/reactos/lib/sdk/cpprt/CMakeLists.txt b/reactos/lib/sdk/cpprt/CMakeLists.txt index 9cb6ce5eedd..4bc1ee511f8 100644 --- a/reactos/lib/sdk/cpprt/CMakeLists.txt +++ b/reactos/lib/sdk/cpprt/CMakeLists.txt @@ -10,4 +10,5 @@ if(ARCH STREQUAL "i386") elseif(ARCH STREQUAL "amd64") add_asm_files(cpprt_asm amd64/cpprt.s) endif() + add_library(cpprt ${SOURCE} ${cpprt_asm}) diff --git a/reactos/lib/sdk/crt/oldnames.cmake b/reactos/lib/sdk/crt/oldnames.cmake index 146db7f6b8d..806ada3570b 100644 --- a/reactos/lib/sdk/crt/oldnames.cmake +++ b/reactos/lib/sdk/crt/oldnames.cmake @@ -1,3 +1,4 @@ + if(NOT MSVC) _add_library(oldnames STATIC EXCLUDE_FROM_ALL ${CMAKE_CURRENT_SOURCE_DIR}/moldname-msvcrt.def) set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/moldname-msvcrt.def PROPERTIES EXTERNAL_OBJECT TRUE) diff --git a/reactos/media/CMakeLists.txt b/reactos/media/CMakeLists.txt index 35fe70d6c2c..5687a6ee690 100644 --- a/reactos/media/CMakeLists.txt +++ b/reactos/media/CMakeLists.txt @@ -1,3 +1,4 @@ + add_subdirectory(fonts) add_subdirectory(inf) add_subdirectory(nls) diff --git a/reactos/media/fonts/CMakeLists.txt b/reactos/media/fonts/CMakeLists.txt index 3aacdc7292f..f0fc0720695 100644 --- a/reactos/media/fonts/CMakeLists.txt +++ b/reactos/media/fonts/CMakeLists.txt @@ -1,3 +1,4 @@ + list(APPEND FONT_FILES DejaVuSans-Bold.ttf DejaVuSans-BoldOblique.ttf @@ -76,8 +77,7 @@ list(APPEND FONT_FILES UbuntuMono-RI.ttf Ubuntu-R.ttf Ubuntu-RI.ttf - UniVGA16.ttf -) + UniVGA16.ttf) foreach(item ${FONT_FILES}) add_cd_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/${item}" DESTINATION reactos/Fonts FOR all) diff --git a/reactos/media/inf/CMakeLists.txt b/reactos/media/inf/CMakeLists.txt index a5cce736946..e3e7c4b5f79 100644 --- a/reactos/media/inf/CMakeLists.txt +++ b/reactos/media/inf/CMakeLists.txt @@ -1,3 +1,4 @@ + list(APPEND INF_FILES acpi.inf audio.inf @@ -38,8 +39,7 @@ list(APPEND INF_FILES usb.inf usbport.inf usbstor.inf - xboxdisp.inf -) + xboxdisp.inf) foreach(item ${INF_FILES}) add_cd_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/${item}" DESTINATION reactos/inf FOR all) diff --git a/reactos/media/nls/CMakeLists.txt b/reactos/media/nls/CMakeLists.txt index b8400fb266c..710d1be3a2e 100644 --- a/reactos/media/nls/CMakeLists.txt +++ b/reactos/media/nls/CMakeLists.txt @@ -1,3 +1,4 @@ + add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/l_intl.nls DESTINATION reactos/system32 NO_CAB FOR all) add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/c_437.nls DESTINATION reactos/system32 NO_CAB FOR all) add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/c_1252.nls DESTINATION reactos/system32 NO_CAB FOR all) @@ -67,10 +68,8 @@ list(APPEND NLS_FILES locale.nls sortkey.nls ctype.nls - l_except.nls -) - - + l_except.nls) + foreach(item ${NLS_FILES}) add_cd_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/${item}" DESTINATION reactos/system32 FOR all) endforeach(item) diff --git a/reactos/media/themes/CMakeLists.txt b/reactos/media/themes/CMakeLists.txt index 48ca9348822..4aa208f01d8 100644 --- a/reactos/media/themes/CMakeLists.txt +++ b/reactos/media/themes/CMakeLists.txt @@ -1 +1,2 @@ + add_subdirectory(lautus.msstyles) diff --git a/reactos/media/themes/lautus.msstyles/CMakeLists.txt b/reactos/media/themes/lautus.msstyles/CMakeLists.txt index bc8cf8b1a09..7aeeffdee19 100644 --- a/reactos/media/themes/lautus.msstyles/CMakeLists.txt +++ b/reactos/media/themes/lautus.msstyles/CMakeLists.txt @@ -1,9 +1,5 @@ -list(APPEND SOURCE - lautus.rc) - -add_library(lautus.msstyles SHARED ${SOURCE}) +add_library(lautus.msstyles SHARED lautus.rc) set_module_type(lautus.msstyles module) set_target_properties(lautus.msstyles PROPERTIES SUFFIX "") - add_cd_file(TARGET lautus.msstyles DESTINATION reactos/Resources/Themes/Lautus FOR all) diff --git a/reactos/media/vgafonts/CMakeLists.txt b/reactos/media/vgafonts/CMakeLists.txt index 5bda76093f8..5347b2bf93d 100644 --- a/reactos/media/vgafonts/CMakeLists.txt +++ b/reactos/media/vgafonts/CMakeLists.txt @@ -9,12 +9,11 @@ list(APPEND SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/862-8x8.bin ${CMAKE_CURRENT_SOURCE_DIR}/865-8x8.bin ${CMAKE_CURRENT_SOURCE_DIR}/866-8x8.bin - ${CMAKE_CURRENT_SOURCE_DIR}/932-8x8.bin -) + ${CMAKE_CURRENT_SOURCE_DIR}/932-8x8.bin) + add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/vgafonts.cab COMMAND native-cabman -M raw -S ${CMAKE_CURRENT_BINARY_DIR}/vgafonts.cab ${SOURCE} DEPENDS ${SOURCE} native-cabman) add_custom_target(vgafonts DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/vgafonts.cab) - add_cd_file(TARGET vgafonts FILE ${CMAKE_CURRENT_BINARY_DIR}/vgafonts.cab DESTINATION reactos NO_CAB FOR all) diff --git a/reactos/modules/CMakeLists.txt b/reactos/modules/CMakeLists.txt index 22e0cfc6886..b362a104927 100644 --- a/reactos/modules/CMakeLists.txt +++ b/reactos/modules/CMakeLists.txt @@ -1,12 +1,12 @@ if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/rostests/) -add_subdirectory(rostests) + add_subdirectory(rostests) endif() if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/rosapps/) -add_subdirectory(rosapps) + add_subdirectory(rosapps) endif() if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/wallpaper/) -add_subdirectory(wallpaper) + add_subdirectory(wallpaper) endif() diff --git a/reactos/subsystems/ntvdm/CMakeLists.txt b/reactos/subsystems/ntvdm/CMakeLists.txt index 29b0c6c2498..a8b2aff73c9 100644 --- a/reactos/subsystems/ntvdm/CMakeLists.txt +++ b/reactos/subsystems/ntvdm/CMakeLists.txt @@ -42,8 +42,7 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/ntvdm.def) add_executable(ntvdm ${SOURCE}) -set_module_type(ntvdm win32cui UNICODE) -set_image_base(ntvdm 0x0F000000) +set_module_type(ntvdm win32cui UNICODE IMAGEBASE 0x0F000000) target_link_libraries(ntvdm fast486) add_importlibs(ntvdm user32 gdi32 advapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET ntvdm DESTINATION reactos/system32 FOR all) diff --git a/reactos/subsystems/win/basesrv/CMakeLists.txt b/reactos/subsystems/win/basesrv/CMakeLists.txt index d40918e95e6..75ed0bbbc87 100644 --- a/reactos/subsystems/win/basesrv/CMakeLists.txt +++ b/reactos/subsystems/win/basesrv/CMakeLists.txt @@ -1,6 +1,5 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys) - spec2def(basesrv.dll basesrv.spec) list(APPEND SOURCE @@ -24,7 +23,6 @@ set_subsystem(basesrv console) ################# END HACK ################# target_link_libraries(basesrv ${PSEH_LIB}) - add_importlibs(basesrv csrsrv ntdll) add_pch(basesrv basesrv.h SOURCE) add_dependencies(basesrv bugcodes) diff --git a/reactos/subsystems/win32/csrsrv/CMakeLists.txt b/reactos/subsystems/win32/csrsrv/CMakeLists.txt index c73dabacf76..bda5e5e5f02 100644 --- a/reactos/subsystems/win32/csrsrv/CMakeLists.txt +++ b/reactos/subsystems/win32/csrsrv/CMakeLists.txt @@ -1,7 +1,6 @@ include_directories(${REACTOS_SOURCE_DIR}/subsystems/win32/csrss/include) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys) - spec2def(csrsrv.dll csrsrv.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -20,13 +19,8 @@ add_library(csrsrv SHARED ${CMAKE_CURRENT_BINARY_DIR}/csrsrv.def) set_module_type(csrsrv nativedll) - target_link_libraries(csrsrv ${PSEH_LIB} smlib) - add_importlibs(csrsrv ntdll smdll) - add_pch(csrsrv srv.h SOURCE) - add_dependencies(csrsrv psdk bugcodes) add_cd_file(TARGET csrsrv DESTINATION reactos/system32 FOR all) - diff --git a/reactos/subsystems/win32/csrss/CMakeLists.txt b/reactos/subsystems/win32/csrss/CMakeLists.txt index 8642dce9bdb..71529bf7687 100644 --- a/reactos/subsystems/win32/csrss/CMakeLists.txt +++ b/reactos/subsystems/win32/csrss/CMakeLists.txt @@ -5,10 +5,7 @@ include_directories( add_executable(csrss csrss.c csrss.rc) set_module_type(csrss nativecui) - target_link_libraries(csrss nt) - add_importlibs(csrss csrsrv ntdll) - add_dependencies(csrss psdk bugcodes) add_cd_file(TARGET csrss DESTINATION reactos/system32 FOR all) diff --git a/reactos/tools/CMakeLists.txt b/reactos/tools/CMakeLists.txt index 9d59b0720ca..396b962e125 100644 --- a/reactos/tools/CMakeLists.txt +++ b/reactos/tools/CMakeLists.txt @@ -12,7 +12,7 @@ add_subdirectory(cdmake) add_subdirectory(gendib) add_subdirectory(geninc) if(NOT MSVC) -add_subdirectory(log2lines) + add_subdirectory(log2lines) endif() add_subdirectory(mkhive) add_subdirectory(obj2bin) diff --git a/reactos/tools/cabman/CMakeLists.txt b/reactos/tools/cabman/CMakeLists.txt index 4d14c1a4666..2fd93f88582 100644 --- a/reactos/tools/cabman/CMakeLists.txt +++ b/reactos/tools/cabman/CMakeLists.txt @@ -1,3 +1,4 @@ + list(APPEND SOURCE cabinet.cxx dfp.cxx @@ -6,7 +7,5 @@ list(APPEND SOURCE raw.cxx) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/zlib) - add_executable(cabman ${SOURCE}) - target_link_libraries(cabman zlibhost) diff --git a/reactos/tools/cdmake/CMakeLists.txt b/reactos/tools/cdmake/CMakeLists.txt index d8fb74cb855..3107a634208 100644 --- a/reactos/tools/cdmake/CMakeLists.txt +++ b/reactos/tools/cdmake/CMakeLists.txt @@ -1,2 +1,2 @@ -add_executable(cdmake cdmake.c dirhash.c llmosrt.c) +add_executable(cdmake cdmake.c dirhash.c llmosrt.c) diff --git a/reactos/tools/hpp/CMakeLists.txt b/reactos/tools/hpp/CMakeLists.txt index 31f34fb20d6..26113d3074e 100644 --- a/reactos/tools/hpp/CMakeLists.txt +++ b/reactos/tools/hpp/CMakeLists.txt @@ -1 +1,2 @@ + add_executable(hpp hpp.c) diff --git a/reactos/tools/log2lines/CMakeLists.txt b/reactos/tools/log2lines/CMakeLists.txt index 5768d3d6149..0eb9c39ccbf 100644 --- a/reactos/tools/log2lines/CMakeLists.txt +++ b/reactos/tools/log2lines/CMakeLists.txt @@ -1,3 +1,4 @@ + list(APPEND SOURCE cache.c cmd.c @@ -12,6 +13,5 @@ list(APPEND SOURCE util.c) include_directories(${REACTOS_SOURCE_DIR}/tools/rsym) - add_executable(log2lines ${SOURCE}) target_link_libraries(log2lines rsym_common) diff --git a/reactos/tools/obj2bin/CMakeLists.txt b/reactos/tools/obj2bin/CMakeLists.txt index 83edc3254d7..5a1aa786a09 100644 --- a/reactos/tools/obj2bin/CMakeLists.txt +++ b/reactos/tools/obj2bin/CMakeLists.txt @@ -1 +1,2 @@ + add_executable(obj2bin obj2bin.c) diff --git a/reactos/tools/rsym/CMakeLists.txt b/reactos/tools/rsym/CMakeLists.txt index ed562769380..447ae519a83 100644 --- a/reactos/tools/rsym/CMakeLists.txt +++ b/reactos/tools/rsym/CMakeLists.txt @@ -1,3 +1,4 @@ + include_directories(${REACTOS_SOURCE_DIR}/tools) add_library(rsym_common rsym_common.c) @@ -7,5 +8,6 @@ if(ARCH STREQUAL "i386") elseif(ARCH STREQUAL "amd64") add_executable(rsym rsym64.c) endif() + target_link_libraries(rsym rsym_common dbghelphost zlibhost unicode) add_executable(raddr2line rsym_common.c raddr2line.c) diff --git a/reactos/tools/spec2def/CMakeLists.txt b/reactos/tools/spec2def/CMakeLists.txt index 15be2cdbb02..831258a46af 100644 --- a/reactos/tools/spec2def/CMakeLists.txt +++ b/reactos/tools/spec2def/CMakeLists.txt @@ -1 +1,2 @@ + add_executable(spec2def spec2def.c) diff --git a/reactos/tools/unicode/CMakeLists.txt b/reactos/tools/unicode/CMakeLists.txt index 278d9dc3d9d..94777f187b7 100644 --- a/reactos/tools/unicode/CMakeLists.txt +++ b/reactos/tools/unicode/CMakeLists.txt @@ -1,5 +1,4 @@ list(APPEND SOURCE - c_037.c c_10000.c c_10001.c diff --git a/reactos/tools/utf16le/CMakeLists.txt b/reactos/tools/utf16le/CMakeLists.txt index 40f0647429e..2b576fd322e 100644 --- a/reactos/tools/utf16le/CMakeLists.txt +++ b/reactos/tools/utf16le/CMakeLists.txt @@ -1 +1,2 @@ + add_executable(utf16le utf16le.cpp) diff --git a/reactos/tools/widl/CMakeLists.txt b/reactos/tools/widl/CMakeLists.txt index 3d9cba2b5f7..7fe6a4c1be4 100644 --- a/reactos/tools/widl/CMakeLists.txt +++ b/reactos/tools/widl/CMakeLists.txt @@ -1,12 +1,10 @@ if(MSVC) - add_definitions( - -Dsnprintf=_snprintf) + add_definitions(-Dsnprintf=_snprintf) # Add this definition for WDK only, VS 9 doesn't like that - if (DEFINED ENV{DDKBUILDENV}) - add_definitions( - -Dvsnprintf=_vsnprintf) + if(DEFINED ENV{DDKBUILDENV}) + add_definitions(-Dvsnprintf=_vsnprintf) endif() list(APPEND SOURCE getopt.c) @@ -32,7 +30,5 @@ list(APPEND SOURCE # Taken from widl.rbuild add_definitions(-DINT16=SHORT) - add_executable(widl ${SOURCE}) - target_link_libraries(widl wpphost) diff --git a/reactos/tools/wpp/CMakeLists.txt b/reactos/tools/wpp/CMakeLists.txt index f418c95692a..8150477580a 100644 --- a/reactos/tools/wpp/CMakeLists.txt +++ b/reactos/tools/wpp/CMakeLists.txt @@ -6,9 +6,8 @@ if(MSVC) -Dstrtoll=_strtoi64) # Add this definition for WDK only, VS 9 doesn't like that - if (DEFINED ENV{DDKBUILDENV}) - add_definitions( - -Dvsnprintf=_vsnprintf) + if(DEFINED ENV{DDKBUILDENV}) + add_definitions(-Dvsnprintf=_vsnprintf) endif() endif() diff --git a/reactos/win32ss/CMakeLists.txt b/reactos/win32ss/CMakeLists.txt index da4afa4e257..361e9db7633 100644 --- a/reactos/win32ss/CMakeLists.txt +++ b/reactos/win32ss/CMakeLists.txt @@ -212,8 +212,7 @@ list(APPEND SOURCE endif() if(KDBG) - list(APPEND SOURCE - gdi/ntgdi/gdikdbgext.c) + list(APPEND SOURCE gdi/ntgdi/gdikdbgext.c) endif() add_asm_files(win32k_asm ${ASM_SOURCE}) @@ -225,11 +224,7 @@ add_library(win32k SHARED ${CMAKE_CURRENT_BINARY_DIR}/win32k.def) set_module_type(win32k kernelmodedriver) - -target_link_libraries(win32k - ${PSEH_LIB} - dxguid - libcntpr) +target_link_libraries(win32k ${PSEH_LIB} dxguid libcntpr) if(USE_DIBLIB) target_link_libraries(win32k diblib) diff --git a/reactos/win32ss/drivers/displays/framebuf/CMakeLists.txt b/reactos/win32ss/drivers/displays/framebuf/CMakeLists.txt index 83209c9a176..ee0ef2e5aa1 100644 --- a/reactos/win32ss/drivers/displays/framebuf/CMakeLists.txt +++ b/reactos/win32ss/drivers/displays/framebuf/CMakeLists.txt @@ -15,7 +15,6 @@ add_library(framebuf SHARED ${CMAKE_CURRENT_BINARY_DIR}/framebuf.def) set_module_type(framebuf kerneldll ENTRYPOINT DrvEnableDriver 12) - add_pch(framebuf framebuf.h SOURCE) target_link_libraries(framebuf libcntpr) add_importlibs(framebuf win32k) diff --git a/reactos/win32ss/drivers/displays/vga/CMakeLists.txt b/reactos/win32ss/drivers/displays/vga/CMakeLists.txt index 0b2678d0558..3ebd44f03b8 100644 --- a/reactos/win32ss/drivers/displays/vga/CMakeLists.txt +++ b/reactos/win32ss/drivers/displays/vga/CMakeLists.txt @@ -20,7 +20,6 @@ add_library(vgaddi SHARED ${CMAKE_CURRENT_BINARY_DIR}/vgaddi.def) set_module_type(vgaddi kerneldll ENTRYPOINT DrvEnableDriver 12) - add_pch(vgaddi vgaddi.h SOURCE) add_importlibs(vgaddi win32k) target_link_libraries(vgaddi libcntpr) diff --git a/reactos/win32ss/drivers/font/ftfd/CMakeLists.txt b/reactos/win32ss/drivers/font/ftfd/CMakeLists.txt index 104f6f205d0..58055455934 100644 --- a/reactos/win32ss/drivers/font/ftfd/CMakeLists.txt +++ b/reactos/win32ss/drivers/font/ftfd/CMakeLists.txt @@ -1,6 +1,5 @@ include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/freetype/include) - spec2def(ftfd.dll ftfd.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -17,13 +16,8 @@ add_library(ftfd SHARED ${CMAKE_CURRENT_BINARY_DIR}/ftfd.def) set_module_type(ftfd kerneldll ENTRYPOINT FtfdEnableDriver 12) - -target_link_libraries(ftfd - freetype - libcntpr) - +target_link_libraries(ftfd freetype libcntpr) add_pch(ftfd ftfd.h SOURCE) add_importlibs(ftfd win32k) add_dependencies(ftfd psdk) add_cd_file(TARGET ftfd DESTINATION reactos/system32 FOR all) - diff --git a/reactos/win32ss/drivers/miniport/vga/CMakeLists.txt b/reactos/win32ss/drivers/miniport/vga/CMakeLists.txt index a09b56198d5..e9851f0a862 100644 --- a/reactos/win32ss/drivers/miniport/vga/CMakeLists.txt +++ b/reactos/win32ss/drivers/miniport/vga/CMakeLists.txt @@ -5,9 +5,7 @@ list(APPEND SOURCE vgamp.h) add_library(vgamp SHARED ${SOURCE} vgamp.rc) - set_module_type(vgamp kernelmodedriver) add_importlibs(vgamp videoprt) - add_pch(vgamp vgamp.h SOURCE) add_cd_file(TARGET vgamp DESTINATION reactos/system32/drivers FOR all) diff --git a/reactos/win32ss/drivers/miniport/vga_new/CMakeLists.txt b/reactos/win32ss/drivers/miniport/vga_new/CMakeLists.txt index c712f12e87c..0918fa6446f 100644 --- a/reactos/win32ss/drivers/miniport/vga_new/CMakeLists.txt +++ b/reactos/win32ss/drivers/miniport/vga_new/CMakeLists.txt @@ -12,10 +12,7 @@ add_library(vga SHARED vga.rc) target_link_libraries(vga libcntpr) - set_module_type(vga kernelmodedriver) add_importlibs(vga videoprt) - add_pch(vga vga.h SOURCE) - add_cd_file(TARGET vga DESTINATION reactos/system32/drivers FOR all) diff --git a/reactos/win32ss/drivers/miniport/vmx_svga/CMakeLists.txt b/reactos/win32ss/drivers/miniport/vmx_svga/CMakeLists.txt index e7db7f286cb..dd1f3d99fea 100644 --- a/reactos/win32ss/drivers/miniport/vmx_svga/CMakeLists.txt +++ b/reactos/win32ss/drivers/miniport/vmx_svga/CMakeLists.txt @@ -1,7 +1,4 @@ -list(APPEND SOURCE vmx_svga.c vmx_svga.rc) - -add_library(vmx_svga SHARED ${SOURCE}) - +add_library(vmx_svga SHARED vmx_svga.c vmx_svga.rc) set_module_type(vmx_svga kernelmodedriver) add_importlibs(vmx_svga ntoskrnl videoprt) diff --git a/reactos/win32ss/drivers/videoprt/CMakeLists.txt b/reactos/win32ss/drivers/videoprt/CMakeLists.txt index 87804b9417d..35271178159 100644 --- a/reactos/win32ss/drivers/videoprt/CMakeLists.txt +++ b/reactos/win32ss/drivers/videoprt/CMakeLists.txt @@ -1,8 +1,6 @@ include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - add_definitions(-D_VIDEOPORT_) - spec2def(videoprt.sys videoprt.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -32,7 +30,5 @@ add_library(videoprt SHARED set_module_type(videoprt kernelmodedriver) add_importlibs(videoprt ntoskrnl hal) - add_pch(videoprt videoprt.h SOURCE) add_cd_file(TARGET videoprt DESTINATION reactos/system32/drivers FOR all) - diff --git a/reactos/win32ss/drivers/watchdog/CMakeLists.txt b/reactos/win32ss/drivers/watchdog/CMakeLists.txt index 87e166bcdf5..5ef5e5cea15 100644 --- a/reactos/win32ss/drivers/watchdog/CMakeLists.txt +++ b/reactos/win32ss/drivers/watchdog/CMakeLists.txt @@ -7,5 +7,4 @@ add_library(watchdog SHARED set_module_type(watchdog kernelmodedriver) add_importlibs(watchdog ntoskrnl) - add_cd_file(TARGET watchdog DESTINATION reactos/system32/drivers FOR all) diff --git a/reactos/win32ss/gdi/gdi32/CMakeLists.txt b/reactos/win32ss/gdi/gdi32/CMakeLists.txt index 34d77251c8b..9ee18750776 100644 --- a/reactos/win32ss/gdi/gdi32/CMakeLists.txt +++ b/reactos/win32ss/gdi/gdi32/CMakeLists.txt @@ -1,16 +1,13 @@ - -add_definitions(-DLANGPACK) - include_directories( include ${REACTOS_SOURCE_DIR}/win32ss/include) +add_definitions(-DLANGPACK) spec2def(gdi32.dll gdi32.spec ADD_IMPORTLIB) if(ARCH STREQUAL "i386") - list(APPEND SOURCE - objects/efloat.c) + list(APPEND SOURCE objects/efloat.c) endif() list(APPEND SOURCE @@ -50,18 +47,8 @@ add_library(gdi32 SHARED gdi32.rc ${CMAKE_CURRENT_BINARY_DIR}/gdi32.def) -set_module_type(gdi32 - win32dll - ENTRYPOINT DllMain 12 - UNICODE) - -target_link_libraries(gdi32 - win32ksys - dxguid - msvcrtex - ${PSEH_LIB}) - +set_module_type(gdi32 win32dll ENTRYPOINT DllMain 12 UNICODE) +target_link_libraries(gdi32 win32ksys dxguid msvcrtex ${PSEH_LIB}) add_importlibs(gdi32 user32 advapi32 kernel32 ntdll) add_pch(gdi32 include/precomp.h SOURCE) add_cd_file(TARGET gdi32 DESTINATION reactos/system32 FOR all) - diff --git a/reactos/win32ss/reactx/dxapi/CMakeLists.txt b/reactos/win32ss/reactx/dxapi/CMakeLists.txt index e839e95a3cd..b74e811f916 100644 --- a/reactos/win32ss/reactx/dxapi/CMakeLists.txt +++ b/reactos/win32ss/reactx/dxapi/CMakeLists.txt @@ -1,6 +1,5 @@ add_definitions(-D_DXAPI_) - spec2def(dxapi.sys dxapi.spec) add_library(dxapi SHARED @@ -10,5 +9,4 @@ add_library(dxapi SHARED set_module_type(dxapi kernelmodedriver) add_importlibs(dxapi ntoskrnl hal videoprt) - add_cd_file(TARGET dxapi DESTINATION reactos/system32/drivers FOR all) diff --git a/reactos/win32ss/reactx/dxgthk/CMakeLists.txt b/reactos/win32ss/reactx/dxgthk/CMakeLists.txt index 65435843a2c..1a9f01eb503 100644 --- a/reactos/win32ss/reactx/dxgthk/CMakeLists.txt +++ b/reactos/win32ss/reactx/dxgthk/CMakeLists.txt @@ -7,10 +7,6 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/dxgthk.def) add_library(dxgthk SHARED ${SOURCE}) - set_module_type(dxgthk kernelmodedriver) - add_importlibs(dxgthk win32k) - - add_cd_file(TARGET dxgthk DESTINATION reactos/system32/drivers FOR all) diff --git a/reactos/win32ss/user/winsrv/CMakeLists.txt b/reactos/win32ss/user/winsrv/CMakeLists.txt index 1bbd16d4f30..81c62a14522 100644 --- a/reactos/win32ss/user/winsrv/CMakeLists.txt +++ b/reactos/win32ss/user/winsrv/CMakeLists.txt @@ -28,6 +28,5 @@ target_link_libraries(winsrv win32ksys libcntpr ${PSEH_LIB} ${CONSRV_TARGET_LINK add_delay_importlibs(winsrv advapi32 ${CONSRV_DELAY_IMPORT_LIBS}) add_importlibs(winsrv csrsrv gdi32 user32 kernel32 ntdll ${CONSRV_IMPORT_LIBS}) - add_dependencies(winsrv bugcodes) add_cd_file(TARGET winsrv DESTINATION reactos/system32 FOR all) diff --git a/reactos/win32ss/user/winsrv/consrv.cmake b/reactos/win32ss/user/winsrv/consrv.cmake index c78700d958b..0f5545cc0e8 100644 --- a/reactos/win32ss/user/winsrv/consrv.cmake +++ b/reactos/win32ss/user/winsrv/consrv.cmake @@ -33,8 +33,7 @@ list(APPEND CONSRV_SOURCE consrv/frontends/gui/text.c consrv/frontends/tui/tuiterm.c # consrv/consrv.rc - consrv/consrv.h - ) + consrv/consrv.h) # # Explicitely enable MS extensions to be able to use unnamed (anonymous) nested structs. @@ -53,9 +52,7 @@ add_library(consrv ${CONSRV_SOURCE}) add_dependencies(consrv psdk) add_pch(consrv consrv/consrv.h CONSRV_SOURCE) #add_object_library(consrv ${CONSRV_SOURCE}) - list(APPEND CONSRV_IMPORT_LIBS psapi) list(APPEND CONSRV_DELAY_IMPORT_LIBS ole32) list(APPEND CONSRV_TARGET_LINK_LIBS uuid) - set_module_type(consrv module UNICODE) diff --git a/reactos/win32ss/user/winsrv/consrv_new.cmake b/reactos/win32ss/user/winsrv/consrv_new.cmake index f26bd609c92..6d4f66abab3 100644 --- a/reactos/win32ss/user/winsrv/consrv_new.cmake +++ b/reactos/win32ss/user/winsrv/consrv_new.cmake @@ -44,9 +44,7 @@ endif() add_library(consrv_new ${CONSRV_SOURCE}) #add_object_library(consrv_new ${CONSRV_SOURCE}) - add_importlibs(consrv_new psapi) # And the default ones from winsrv add_delay_importlibs(consrv_new ole32) # And the default ones from winsrv target_link_libraries(consrv_new uuid) # And the default ones from winsrv - set_module_type(consrv_new module UNICODE) diff --git a/reactos/win32ss/user/winsrv/usersrv.cmake b/reactos/win32ss/user/winsrv/usersrv.cmake index 38a96ab36d9..60449af195e 100644 --- a/reactos/win32ss/user/winsrv/usersrv.cmake +++ b/reactos/win32ss/user/winsrv/usersrv.cmake @@ -7,11 +7,9 @@ list(APPEND USERSRV_SOURCE usersrv/register.c usersrv/shutdown.c # usersrv/usersrv.rc - usersrv/usersrv.h - ) + usersrv/usersrv.h) add_library(usersrv ${USERSRV_SOURCE}) add_pch(usersrv usersrv/usersrv.h USERSRV_SOURCE) #add_object_library(usersrv ${USERSRV_SOURCE}) - set_module_type(usersrv module UNICODE)