[CMAKE]
authorAmine Khaldi <amine.khaldi@reactos.org>
Fri, 17 Oct 2014 23:28:29 +0000 (23:28 +0000)
committerAmine Khaldi <amine.khaldi@reactos.org>
Fri, 17 Oct 2014 23:28:29 +0000 (23:28 +0000)
* Make the minimum required version 2.8.
* Remove redundant psdk dependencies.
* Tidy up CMake files.

svn path=/trunk/; revision=64795

367 files changed:
reactos/CMakeLists.txt
reactos/base/applications/atactl/CMakeLists.txt
reactos/base/applications/cmdutils/help/CMakeLists.txt
reactos/base/applications/cmdutils/hostname/CMakeLists.txt
reactos/base/applications/cmdutils/lodctr/CMakeLists.txt
reactos/base/applications/cmdutils/mode/CMakeLists.txt
reactos/base/applications/cmdutils/more/CMakeLists.txt
reactos/base/applications/games/solitaire/CMakeLists.txt
reactos/base/applications/kbswitch/CMakeLists.txt
reactos/base/applications/kbswitch/kbsdll/CMakeLists.txt
reactos/base/applications/mscutils/eventvwr/CMakeLists.txt
reactos/base/applications/network/arp/CMakeLists.txt
reactos/base/applications/network/dwnl/CMakeLists.txt
reactos/base/applications/network/netsh/CMakeLists.txt
reactos/base/applications/network/ping/CMakeLists.txt
reactos/base/applications/network/route/CMakeLists.txt
reactos/base/applications/network/tracert/CMakeLists.txt
reactos/base/applications/network/whois/CMakeLists.txt
reactos/base/applications/network/wlanconf/CMakeLists.txt
reactos/base/applications/setup16/CMakeLists.txt
reactos/base/applications/shutdown/CMakeLists.txt
reactos/base/applications/sndrec32/CMakeLists.txt
reactos/base/applications/wordpad/CMakeLists.txt
reactos/base/services/rpcss/CMakeLists.txt
reactos/base/services/spoolsv/CMakeLists.txt
reactos/base/services/telnetd/CMakeLists.txt
reactos/base/services/thmsvc/CMakeLists.txt
reactos/base/services/umpnpmgr/CMakeLists.txt
reactos/base/services/wlansvc/CMakeLists.txt
reactos/base/setup/setup/CMakeLists.txt
reactos/base/setup/usetup/CMakeLists.txt
reactos/base/shell/explorer-new/CMakeLists.txt
reactos/base/shell/explorer/CMakeLists.txt
reactos/base/system/autochk/CMakeLists.txt
reactos/base/system/bootok/CMakeLists.txt
reactos/base/system/diskpart/CMakeLists.txt
reactos/base/system/expand/CMakeLists.txt
reactos/base/system/format/CMakeLists.txt
reactos/base/system/lsass/CMakeLists.txt
reactos/base/system/msiexec/CMakeLists.txt
reactos/base/system/rundll32/CMakeLists.txt
reactos/base/system/services/CMakeLists.txt
reactos/boot/bootdata/packages/CMakeLists.txt
reactos/boot/freeldr/bootsect/CMakeLists.txt
reactos/boot/freeldr/freeldr/CMakeLists.txt
reactos/boot/freeldr/install/CMakeLists.txt
reactos/dll/3rdparty/dxtn/CMakeLists.txt
reactos/dll/3rdparty/libjpeg/CMakeLists.txt
reactos/dll/3rdparty/libtiff/CMakeLists.txt
reactos/dll/3rdparty/libxslt/CMakeLists.txt
reactos/dll/cpl/appwiz/CMakeLists.txt
reactos/dll/cpl/console/CMakeLists.txt
reactos/dll/cpl/desk/CMakeLists.txt
reactos/dll/cpl/hdwwiz/CMakeLists.txt
reactos/dll/cpl/hotplug/CMakeLists.txt
reactos/dll/cpl/input/CMakeLists.txt
reactos/dll/cpl/intl/CMakeLists.txt
reactos/dll/cpl/joy/CMakeLists.txt
reactos/dll/cpl/main/CMakeLists.txt
reactos/dll/cpl/mmsys/CMakeLists.txt
reactos/dll/cpl/ncpa/CMakeLists.txt
reactos/dll/cpl/odbccp32/CMakeLists.txt
reactos/dll/cpl/powercfg/CMakeLists.txt
reactos/dll/cpl/sysdm/CMakeLists.txt
reactos/dll/cpl/telephon/CMakeLists.txt
reactos/dll/cpl/timedate/CMakeLists.txt
reactos/dll/cpl/usrmgr/CMakeLists.txt
reactos/dll/cpl/wined3dcfg/CMakeLists.txt
reactos/dll/directx/d3d8thk/CMakeLists.txt
reactos/dll/directx/ddraw/CMakeLists.txt
reactos/dll/directx/ksproxy/CMakeLists.txt
reactos/dll/directx/ksuser/CMakeLists.txt
reactos/dll/directx/wine/d3d8/CMakeLists.txt
reactos/dll/directx/wine/d3d9/CMakeLists.txt
reactos/dll/directx/wine/d3dcompiler_43/CMakeLists.txt
reactos/dll/directx/wine/d3dx9_24/CMakeLists.txt
reactos/dll/directx/wine/d3dx9_25/CMakeLists.txt
reactos/dll/directx/wine/d3dx9_26/CMakeLists.txt
reactos/dll/directx/wine/d3dx9_27/CMakeLists.txt
reactos/dll/directx/wine/d3dx9_28/CMakeLists.txt
reactos/dll/directx/wine/d3dx9_29/CMakeLists.txt
reactos/dll/directx/wine/d3dx9_30/CMakeLists.txt
reactos/dll/directx/wine/d3dx9_31/CMakeLists.txt
reactos/dll/directx/wine/d3dx9_32/CMakeLists.txt
reactos/dll/directx/wine/d3dx9_33/CMakeLists.txt
reactos/dll/directx/wine/d3dx9_34/CMakeLists.txt
reactos/dll/directx/wine/d3dx9_35/CMakeLists.txt
reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt
reactos/dll/directx/wine/d3dx9_37/CMakeLists.txt
reactos/dll/directx/wine/d3dx9_38/CMakeLists.txt
reactos/dll/directx/wine/d3dx9_39/CMakeLists.txt
reactos/dll/directx/wine/d3dx9_40/CMakeLists.txt
reactos/dll/directx/wine/d3dx9_41/CMakeLists.txt
reactos/dll/directx/wine/d3dx9_42/CMakeLists.txt
reactos/dll/directx/wine/d3dx9_43/CMakeLists.txt
reactos/dll/directx/wine/d3dxof/CMakeLists.txt
reactos/dll/directx/wine/dplayx/CMakeLists.txt
reactos/dll/directx/wine/dsound/CMakeLists.txt
reactos/dll/directx/wine/dxgi/CMakeLists.txt
reactos/dll/directx/wine/quartz/CMakeLists.txt
reactos/dll/nls/idndl/CMakeLists.txt
reactos/dll/nls/normaliz/CMakeLists.txt
reactos/dll/ntdll/CMakeLists.txt
reactos/dll/opengl/mesa/CMakeLists.txt
reactos/dll/opengl/mesa/drivers/common/CMakeLists.txt
reactos/dll/opengl/mesa/main/CMakeLists.txt
reactos/dll/opengl/mesa/swrast/CMakeLists.txt
reactos/dll/opengl/mesa/swrast_setup/CMakeLists.txt
reactos/dll/opengl/mesa/x86/CMakeLists.txt
reactos/dll/shellext/deskadp/CMakeLists.txt
reactos/dll/shellext/deskmon/CMakeLists.txt
reactos/dll/shellext/devcpux/CMakeLists.txt
reactos/dll/shellext/fontext/CMakeLists.txt
reactos/dll/shellext/slayer/CMakeLists.txt
reactos/dll/win32/aclui/CMakeLists.txt
reactos/dll/win32/actxprxy/CMakeLists.txt
reactos/dll/win32/advapi32/CMakeLists.txt
reactos/dll/win32/advpack/CMakeLists.txt
reactos/dll/win32/atl/CMakeLists.txt
reactos/dll/win32/atl100/CMakeLists.txt
reactos/dll/win32/authz/CMakeLists.txt
reactos/dll/win32/avicap32/CMakeLists.txt
reactos/dll/win32/beepmidi/CMakeLists.txt
reactos/dll/win32/browseui/CMakeLists.txt
reactos/dll/win32/cfgmgr32/CMakeLists.txt
reactos/dll/win32/comcat/CMakeLists.txt
reactos/dll/win32/compstui/CMakeLists.txt
reactos/dll/win32/credui/CMakeLists.txt
reactos/dll/win32/crtdll/CMakeLists.txt
reactos/dll/win32/cryptdlg/CMakeLists.txt
reactos/dll/win32/cryptdll/CMakeLists.txt
reactos/dll/win32/cryptnet/CMakeLists.txt
reactos/dll/win32/cryptui/CMakeLists.txt
reactos/dll/win32/devmgr/CMakeLists.txt
reactos/dll/win32/dhcpcsvc/CMakeLists.txt
reactos/dll/win32/dnsapi/CMakeLists.txt
reactos/dll/win32/dwmapi/CMakeLists.txt
reactos/dll/win32/fmifs/CMakeLists.txt
reactos/dll/win32/framedyn/CMakeLists.txt
reactos/dll/win32/fusion/CMakeLists.txt
reactos/dll/win32/gdiplus/CMakeLists.txt
reactos/dll/win32/getuname/CMakeLists.txt
reactos/dll/win32/hhctrl.ocx/CMakeLists.txt
reactos/dll/win32/hid/CMakeLists.txt
reactos/dll/win32/hlink/CMakeLists.txt
reactos/dll/win32/ieframe/CMakeLists.txt
reactos/dll/win32/imaadp32.acm/CMakeLists.txt
reactos/dll/win32/imagehlp/CMakeLists.txt
reactos/dll/win32/inetmib1/CMakeLists.txt
reactos/dll/win32/initpki/CMakeLists.txt
reactos/dll/win32/iologmsg/CMakeLists.txt
reactos/dll/win32/iphlpapi/CMakeLists.txt
reactos/dll/win32/itircl/CMakeLists.txt
reactos/dll/win32/itss/CMakeLists.txt
reactos/dll/win32/jscript/CMakeLists.txt
reactos/dll/win32/jsproxy/CMakeLists.txt
reactos/dll/win32/kernel32_vista/CMakeLists.txt
reactos/dll/win32/lpk/CMakeLists.txt
reactos/dll/win32/lsasrv/CMakeLists.txt
reactos/dll/win32/lz32/CMakeLists.txt
reactos/dll/win32/mciavi32/CMakeLists.txt
reactos/dll/win32/mcicda/CMakeLists.txt
reactos/dll/win32/mciqtz32/CMakeLists.txt
reactos/dll/win32/mciseq/CMakeLists.txt
reactos/dll/win32/mciwave/CMakeLists.txt
reactos/dll/win32/mgmtapi/CMakeLists.txt
reactos/dll/win32/mmdrv/CMakeLists.txt
reactos/dll/win32/mprapi/CMakeLists.txt
reactos/dll/win32/msadp32.acm/CMakeLists.txt
reactos/dll/win32/msafd/CMakeLists.txt
reactos/dll/win32/mscms/CMakeLists.txt
reactos/dll/win32/mscoree/CMakeLists.txt
reactos/dll/win32/mshtml.tlb/CMakeLists.txt
reactos/dll/win32/mshtml/CMakeLists.txt
reactos/dll/win32/msi/CMakeLists.txt
reactos/dll/win32/msimg32/CMakeLists.txt
reactos/dll/win32/msnet32/CMakeLists.txt
reactos/dll/win32/mspatcha/CMakeLists.txt
reactos/dll/win32/msports/CMakeLists.txt
reactos/dll/win32/mssign32/CMakeLists.txt
reactos/dll/win32/mssip32/CMakeLists.txt
reactos/dll/win32/msvcrt20/CMakeLists.txt
reactos/dll/win32/msvcrt40/CMakeLists.txt
reactos/dll/win32/mswsock/CMakeLists.txt
reactos/dll/win32/msxml/CMakeLists.txt
reactos/dll/win32/msxml2/CMakeLists.txt
reactos/dll/win32/msxml4/CMakeLists.txt
reactos/dll/win32/msxml6/CMakeLists.txt
reactos/dll/win32/nddeapi/CMakeLists.txt
reactos/dll/win32/netapi32/CMakeLists.txt
reactos/dll/win32/netcfgx/CMakeLists.txt
reactos/dll/win32/netshell/CMakeLists.txt
reactos/dll/win32/newdev/CMakeLists.txt
reactos/dll/win32/ntdsapi/CMakeLists.txt
reactos/dll/win32/ntlanman/CMakeLists.txt
reactos/dll/win32/ntmarta/CMakeLists.txt
reactos/dll/win32/ntprint/CMakeLists.txt
reactos/dll/win32/objsel/CMakeLists.txt
reactos/dll/win32/odbccp32/CMakeLists.txt
reactos/dll/win32/ole32/CMakeLists.txt
reactos/dll/win32/oleaut32/CMakeLists.txt
reactos/dll/win32/olecli32/CMakeLists.txt
reactos/dll/win32/olesvr32/CMakeLists.txt
reactos/dll/win32/olethk32/CMakeLists.txt
reactos/dll/win32/powrprof/CMakeLists.txt
reactos/dll/win32/psapi/CMakeLists.txt
reactos/dll/win32/pstorec/CMakeLists.txt
reactos/dll/win32/qmgrprxy/CMakeLists.txt
reactos/dll/win32/rasadhlp/CMakeLists.txt
reactos/dll/win32/rasapi32/CMakeLists.txt
reactos/dll/win32/resutils/CMakeLists.txt
reactos/dll/win32/rpcrt4/CMakeLists.txt
reactos/dll/win32/rsabase/CMakeLists.txt
reactos/dll/win32/samsrv/CMakeLists.txt
reactos/dll/win32/scrrun/CMakeLists.txt
reactos/dll/win32/secur32/CMakeLists.txt
reactos/dll/win32/setupapi/CMakeLists.txt
reactos/dll/win32/sfc/CMakeLists.txt
reactos/dll/win32/sfc_os/CMakeLists.txt
reactos/dll/win32/shdocvw/CMakeLists.txt
reactos/dll/win32/shell32/CMakeLists.txt
reactos/dll/win32/shfolder/CMakeLists.txt
reactos/dll/win32/shimgvw/CMakeLists.txt
reactos/dll/win32/smdll/CMakeLists.txt
reactos/dll/win32/sndblst/CMakeLists.txt
reactos/dll/win32/softpub/CMakeLists.txt
reactos/dll/win32/srclient/CMakeLists.txt
reactos/dll/win32/stdole32.tlb/CMakeLists.txt
reactos/dll/win32/syssetup/CMakeLists.txt
reactos/dll/win32/t2embed/CMakeLists.txt
reactos/dll/win32/traffic/CMakeLists.txt
reactos/dll/win32/uext2/CMakeLists.txt
reactos/dll/win32/ufat/CMakeLists.txt
reactos/dll/win32/ufatx/CMakeLists.txt
reactos/dll/win32/unicows/CMakeLists.txt
reactos/dll/win32/untfs/CMakeLists.txt
reactos/dll/win32/updspapi/CMakeLists.txt
reactos/dll/win32/url/CMakeLists.txt
reactos/dll/win32/vdmdbg/CMakeLists.txt
reactos/dll/win32/wdmaud.drv/CMakeLists.txt
reactos/dll/win32/windowscodecs/CMakeLists.txt
reactos/dll/win32/winfax/CMakeLists.txt
reactos/dll/win32/wing32/CMakeLists.txt
reactos/dll/win32/winhttp/CMakeLists.txt
reactos/dll/win32/winmm/CMakeLists.txt
reactos/dll/win32/winmm/midimap/CMakeLists.txt
reactos/dll/win32/wlanapi/CMakeLists.txt
reactos/dll/win32/wmi/CMakeLists.txt
reactos/dll/win32/ws2_32/CMakeLists.txt
reactos/dll/win32/ws2_32_new/CMakeLists.txt
reactos/dll/win32/ws2help/CMakeLists.txt
reactos/dll/win32/wshirda/CMakeLists.txt
reactos/dll/win32/wshtcpip/CMakeLists.txt
reactos/dll/win32/wsock32/CMakeLists.txt
reactos/drivers/base/bootvid/CMakeLists.txt
reactos/drivers/base/condrv/CMakeLists.txt
reactos/drivers/base/kdgdb/CMakeLists.txt
reactos/drivers/base/kdrosdbg/CMakeLists.txt
reactos/drivers/base/nmidebug/CMakeLists.txt
reactos/drivers/base/null/CMakeLists.txt
reactos/drivers/battery/battc/CMakeLists.txt
reactos/drivers/bus/acpi/cmbatt/CMakeLists.txt
reactos/drivers/bus/acpi/compbatt/CMakeLists.txt
reactos/drivers/bus/pcix/CMakeLists.txt
reactos/drivers/crypto/ksecdd/CMakeLists.txt
reactos/drivers/filesystems/cdfs/CMakeLists.txt
reactos/drivers/filesystems/fastfat/CMakeLists.txt
reactos/drivers/filesystems/fastfat_new/CMakeLists.txt
reactos/drivers/filesystems/msfs/CMakeLists.txt
reactos/drivers/filesystems/ntfs/CMakeLists.txt
reactos/drivers/filters/mountmgr/CMakeLists.txt
reactos/drivers/hid/hidclass/CMakeLists.txt
reactos/drivers/hid/hidparse/CMakeLists.txt
reactos/drivers/hid/hidusb/CMakeLists.txt
reactos/drivers/hid/kbdhid/CMakeLists.txt
reactos/drivers/hid/mouhid/CMakeLists.txt
reactos/drivers/ksfilter/ks/CMakeLists.txt
reactos/drivers/ksfilter/swenum/CMakeLists.txt
reactos/drivers/network/afd/CMakeLists.txt
reactos/drivers/network/ndis/CMakeLists.txt
reactos/drivers/network/ndisuio/CMakeLists.txt
reactos/drivers/network/tcpip/CMakeLists.txt
reactos/drivers/parallel/parallel/CMakeLists.txt
reactos/drivers/storage/class/cdrom/CMakeLists.txt
reactos/drivers/storage/class/cdrom_new/CMakeLists.txt
reactos/drivers/storage/class/class2/CMakeLists.txt
reactos/drivers/storage/class/disk/CMakeLists.txt
reactos/drivers/storage/class/disk_new/CMakeLists.txt
reactos/drivers/storage/class/ramdisk/CMakeLists.txt
reactos/drivers/storage/classpnp/CMakeLists.txt
reactos/drivers/storage/ide/atapi/CMakeLists.txt
reactos/drivers/storage/ide/pciide/CMakeLists.txt
reactos/drivers/storage/ide/pciidex/CMakeLists.txt
reactos/drivers/storage/ide/uniata/CMakeLists.txt
reactos/drivers/storage/scsiport/CMakeLists.txt
reactos/drivers/usb/usbccgp/CMakeLists.txt
reactos/drivers/usb/usbd/CMakeLists.txt
reactos/drivers/usb/usbehci/CMakeLists.txt
reactos/drivers/usb/usbhub/CMakeLists.txt
reactos/drivers/usb/usbohci/CMakeLists.txt
reactos/drivers/usb/usbstor/CMakeLists.txt
reactos/drivers/usb/usbuhci/CMakeLists.txt
reactos/drivers/wdm/audio/backpln/audio_test/CMakeLists.txt
reactos/drivers/wdm/audio/backpln/portcls/CMakeLists.txt
reactos/drivers/wdm/audio/drivers/CMIDriver/CMakeLists.txt
reactos/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/CMakeLists.txt
reactos/drivers/wdm/audio/drm/drmk/CMakeLists.txt
reactos/drivers/wdm/audio/filters/kmixer/CMakeLists.txt
reactos/drivers/wdm/audio/legacy/wdmaud/CMakeLists.txt
reactos/drivers/wmi/CMakeLists.txt
reactos/lib/3rdparty/bzip2/CMakeLists.txt
reactos/lib/3rdparty/zlib/CMakeLists.txt
reactos/lib/atl/CMakeLists.txt
reactos/lib/cryptlib/CMakeLists.txt
reactos/lib/dnslib/CMakeLists.txt
reactos/lib/drivers/libusb/CMakeLists.txt
reactos/lib/drivers/lwip/CMakeLists.txt
reactos/lib/drivers/sound/libusbaudio/CMakeLists.txt
reactos/lib/drivers/sound/mmixer/CMakeLists.txt
reactos/lib/drivers/sound/stdunk/CMakeLists.txt
reactos/lib/fslib/ntfslib/CMakeLists.txt
reactos/lib/gcc_ssp/CMakeLists.txt
reactos/lib/recyclebin/CMakeLists.txt
reactos/lib/sdk/RunTmChk/CMakeLists.txt
reactos/lib/sdk/comsupp/CMakeLists.txt
reactos/lib/sdk/cpprt/CMakeLists.txt
reactos/lib/sdk/crt/oldnames.cmake
reactos/media/CMakeLists.txt
reactos/media/fonts/CMakeLists.txt
reactos/media/inf/CMakeLists.txt
reactos/media/nls/CMakeLists.txt
reactos/media/themes/CMakeLists.txt
reactos/media/themes/lautus.msstyles/CMakeLists.txt
reactos/media/vgafonts/CMakeLists.txt
reactos/modules/CMakeLists.txt
reactos/subsystems/ntvdm/CMakeLists.txt
reactos/subsystems/win/basesrv/CMakeLists.txt
reactos/subsystems/win32/csrsrv/CMakeLists.txt
reactos/subsystems/win32/csrss/CMakeLists.txt
reactos/tools/CMakeLists.txt
reactos/tools/cabman/CMakeLists.txt
reactos/tools/cdmake/CMakeLists.txt
reactos/tools/hpp/CMakeLists.txt
reactos/tools/log2lines/CMakeLists.txt
reactos/tools/obj2bin/CMakeLists.txt
reactos/tools/rsym/CMakeLists.txt
reactos/tools/spec2def/CMakeLists.txt
reactos/tools/unicode/CMakeLists.txt
reactos/tools/utf16le/CMakeLists.txt
reactos/tools/widl/CMakeLists.txt
reactos/tools/wpp/CMakeLists.txt
reactos/win32ss/CMakeLists.txt
reactos/win32ss/drivers/displays/framebuf/CMakeLists.txt
reactos/win32ss/drivers/displays/vga/CMakeLists.txt
reactos/win32ss/drivers/font/ftfd/CMakeLists.txt
reactos/win32ss/drivers/miniport/vga/CMakeLists.txt
reactos/win32ss/drivers/miniport/vga_new/CMakeLists.txt
reactos/win32ss/drivers/miniport/vmx_svga/CMakeLists.txt
reactos/win32ss/drivers/videoprt/CMakeLists.txt
reactos/win32ss/drivers/watchdog/CMakeLists.txt
reactos/win32ss/gdi/gdi32/CMakeLists.txt
reactos/win32ss/reactx/dxapi/CMakeLists.txt
reactos/win32ss/reactx/dxgthk/CMakeLists.txt
reactos/win32ss/user/winsrv/CMakeLists.txt
reactos/win32ss/user/winsrv/consrv.cmake
reactos/win32ss/user/winsrv/consrv_new.cmake
reactos/win32ss/user/winsrv/usersrv.cmake

index 68d31b7..8cf8fb4 100644 (file)
@@ -1,5 +1,5 @@
 
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8)
 
 if(POLICY CMP0017)
     # Shadow cmake provided modules
index c188582..0070358 100644 (file)
@@ -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)
index 4a2adc0..cce3258 100644 (file)
@@ -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)
index fec5032..50b3860 100644 (file)
@@ -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)
index 6cfbd44..9c2feaa 100644 (file)
@@ -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)
index 354c426..bf53b6a 100644 (file)
@@ -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)
index 28fab89..9abb016 100644 (file)
@@ -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)
index 5172ccb..5528121 100644 (file)
@@ -1,6 +1,5 @@
 
 set_cpp(WITH_RUNTIME)
-
 include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/cardlib)
 
 list(APPEND SOURCE
index 6fe41a5..23d7831 100644 (file)
@@ -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)
index 8484ee6..b192592 100644 (file)
@@ -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)
index fff7e3a..911f446 100644 (file)
@@ -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)
index 31e3066..7f86c4c 100644 (file)
@@ -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)
index 1e7329b..ac0517d 100644 (file)
@@ -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()
index 4b7f004..bf0265e 100644 (file)
@@ -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)
index 003e90e..141802a 100644 (file)
@@ -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)
index 3f78a6e..bbb89e4 100644 (file)
@@ -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)
index 9b55089..ec605ed 100644 (file)
@@ -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)
index 755fc7a..be14ff5 100644 (file)
@@ -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)
index fe931b3..973abbd 100644 (file)
@@ -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)
index 9f1d652..9b8f5b9 100644 (file)
@@ -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)
index 8d553e7..3d27bb6 100644 (file)
@@ -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)
index 72697a1..1319008 100644 (file)
@@ -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)
index 96f5f3c..4a1c36e 100644 (file)
@@ -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)
index 159479d..583cc03 100644 (file)
@@ -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)
index a9ae1b2..1d4686c 100644 (file)
@@ -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)
index f22c3e8..28a1dbb 100644 (file)
@@ -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)
index 438f25d..6b63604 100644 (file)
@@ -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)
index 5987acf..2aad52f 100644 (file)
@@ -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)
index 7f146da..eb4e574 100644 (file)
@@ -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
index 482ffe6..6eae7d2 100644 (file)
@@ -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)
index a53984e..b6125f5 100644 (file)
@@ -1,5 +1,6 @@
 
 add_definitions(${I18N_DEFS})
+
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${REACTOS_SOURCE_DIR}/lib/inflib
index 55ccc90..2d53be7 100644 (file)
@@ -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)
index abd294d..518cf43 100644 (file)
@@ -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)
index b132b6c..ba720da 100644 (file)
@@ -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)
index 216a0fc..22bc0ec 100644 (file)
@@ -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)
index f1cbf96..7271df6 100644 (file)
@@ -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)
index 5a680bf..db4f8f3 100644 (file)
@@ -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)
index 0907bc0..68ca546 100644 (file)
@@ -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)
index def568a..46ca92b 100644 (file)
@@ -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)
index c267c09..e8c8fba 100644 (file)
@@ -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)
index 078d85a..9eef981 100644 (file)
@@ -1,3 +1,4 @@
+
 add_executable(rundll32 rundll32.c rundll32.rc)
 set_module_type(rundll32 win32gui UNICODE)
 add_importlibs(rundll32 user32 msvcrt kernel32 ntdll)
index c3ea514..31b4b58 100644 (file)
@@ -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
index f9d1e84..9c3ca3f 100644 (file)
@@ -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)
-
index 51b0ebb..881c84d 100644 (file)
@@ -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()
-
index 9e8c355..b25d7f9 100644 (file)
@@ -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()
index cca907c..8379b31 100644 (file)
@@ -4,5 +4,4 @@ add_executable(installfreeldr EXCLUDE_FROM_ALL
     volume.c)
 
 set_module_type(installfreeldr win32cui)
-
 add_importlibs(installfreeldr msvcrt kernel32)
index d4b2425..37b33b3 100644 (file)
@@ -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)
index bd04baf..3203ca2 100644 (file)
@@ -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)
index 6ea7bb0..0373625 100644 (file)
@@ -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)
 
index 648ca8d..690ff02 100644 (file)
@@ -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)
 
index 9c3ea48..acb3c83 100644 (file)
@@ -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
index 245bc2b..c65229a 100644 (file)
@@ -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)
index 7ff759c..41cfa72 100644 (file)
@@ -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)
index accc2fe..aa4a149 100644 (file)
@@ -1,18 +1,11 @@
 
 spec2def(hdwwiz.cpl hdwwiz.spec)
-add_library(hdwwiz SHARED hdwwiz.c hdwwiz.rc ${CMAKE_CURRENT_BINARY_DIR}/hdwwiz.def)
-set_module_type(hdwwiz cpl UNICODE)
 
-add_importlibs(hdwwiz
-    msvcrt
-    setupapi
-    advapi32
-    comctl32
-    rpcrt4
-    user32
-    gdi32
-    devmgr
-    kernel32
-    ntdll)
+add_library(hdwwiz SHARED
+    hdwwiz.c
+    hdwwiz.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/hdwwiz.def)
 
+set_module_type(hdwwiz cpl UNICODE)
+add_importlibs(hdwwiz setupapi advapi32 comctl32 rpcrt4 user32 gdi32 devmgr msvcrt kernel32 ntdll)
 add_cd_file(TARGET hdwwiz DESTINATION reactos/system32 FOR all)
index c5ec3d6..46c8d3d 100644 (file)
@@ -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)
index 6a262f5..a04dbc0 100644 (file)
@@ -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)
index 22811a6..47ece39 100644 (file)
@@ -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)
index d0759ae..5bee7b4 100644 (file)
@@ -1,16 +1,12 @@
 
 spec2def(joy.cpl joy.spec)
-add_library(joy SHARED joy.c joy.rc ${CMAKE_CURRENT_BINARY_DIR}/joy.def)
-set_module_type(joy cpl UNICODE)
-target_link_libraries(joy uuid)
 
-add_importlibs(joy
-    user32
-    comctl32
-    ole32
-    shell32
-    msvcrt
-    kernel32
-    ntdll)
+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_cd_file(TARGET joy DESTINATION reactos/system32 FOR all)
index e17d272..e450ddb 100644 (file)
@@ -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)
index 51b7765..2409162 100644 (file)
@@ -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)
index 4c64554..2d92f48 100644 (file)
@@ -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)
index 1001045..950940e 100644 (file)
@@ -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)
index 93fb40a..99f8354 100644 (file)
@@ -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)
index c1ea10b..c5ddac5 100644 (file)
@@ -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)
index cb53705..000279c 100644 (file)
@@ -1,16 +1,12 @@
 
 spec2def(telephon.cpl telephon.spec)
-add_library(telephon SHARED telephon.c telephon.rc ${CMAKE_CURRENT_BINARY_DIR}/telephon.def)
-set_module_type(telephon cpl UNICODE)
-target_link_libraries(telephon uuid)
 
-add_importlibs(telephon
-    advapi32
-    user32
-    comctl32
-    ole32
-    shell32
-    msvcrt
-    kernel32)
+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_cd_file(TARGET telephon DESTINATION reactos/system32 FOR all)
index 5d87b27..21e5c84 100644 (file)
@@ -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)
index 4a8a5ab..5ef0c1b 100644 (file)
@@ -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)
index efef5da..fc4b606 100644 (file)
@@ -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)
index 0c88e5d..a17a115 100644 (file)
@@ -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)
index 1d69eee..73518df 100644 (file)
@@ -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)
index e3ca96f..122623b 100644 (file)
@@ -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)
index 50993f7..d113df9 100644 (file)
@@ -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)
-
index 5e3f473..338fded 100644 (file)
@@ -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
index 4cc1ad1..2337066 100644 (file)
@@ -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
index 5b3c473..7578f2f 100644 (file)
@@ -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
index 72ea548..e733766 100644 (file)
@@ -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
index 36b42f2..ca93608 100644 (file)
@@ -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
index ba17b98..279e45a 100644 (file)
@@ -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
index 239cec6..849686d 100644 (file)
@@ -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
index 84f5615..3d28368 100644 (file)
@@ -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
index 9ed14f7..07db5a9 100644 (file)
@@ -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
index caa2af1..f63010b 100644 (file)
@@ -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
index c693b9f..2dd3d71 100644 (file)
@@ -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
index e9e3514..b77dc54 100644 (file)
@@ -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
index 2476260..f8438b3 100644 (file)
@@ -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
index 049cdcf..419e4c6 100644 (file)
@@ -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
index b02b02b..0447b25 100644 (file)
@@ -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
index d366786..e4e5a45 100644 (file)
@@ -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
index 4ba990d..1859f9a 100644 (file)
@@ -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
index 8ffd5ad..d71dd06 100644 (file)
@@ -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
index d4775d7..e2e9935 100644 (file)
@@ -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
index 0e6e4e9..c6ed02c 100644 (file)
@@ -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
index 108e25a..4a22e81 100644 (file)
@@ -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
index 30748e9..dffceee 100644 (file)
@@ -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
index 2aa9191..0df6667 100644 (file)
@@ -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
index 3219363..ac37779 100644 (file)
@@ -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
index 8b6ba4a..2027631 100644 (file)
@@ -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
index e660e4e..57d7188 100644 (file)
@@ -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
index 53dc609..8054d4f 100644 (file)
@@ -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
index 50040af..4bfc6e7 100644 (file)
@@ -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)
index 322671e..590ceec 100644 (file)
@@ -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)
index 1180cea..fcda54b 100644 (file)
@@ -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)
index e2b1460..982e260 100644 (file)
@@ -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)
-
index f2ffd47..004d505 100644 (file)
@@ -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()
 
index 2f8695c..2037330 100644 (file)
@@ -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})
index b5218e4..c42d9cc 100644 (file)
@@ -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")
index bc78d59..18302ce 100644 (file)
@@ -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()
index 4eb1d43..b488022 100644 (file)
@@ -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})
index aaec309..19d484f 100644 (file)
@@ -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})
index 99fa79c..9d8cda1 100644 (file)
@@ -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)
index c6b216f..8691316 100644 (file)
@@ -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)
index 263501c..08624da 100644 (file)
@@ -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)
index 78d88d3..a31e78d 100644 (file)
@@ -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)
index 825320d..62d898e 100644 (file)
@@ -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)
index 58f6370..de7a6b1 100644 (file)
@@ -1,6 +1,5 @@
 
 spec2def(aclui.dll aclui.spec)
-
 add_definitions(-DSUPPORT_UXTHEME)
 
 list(APPEND SOURCE
index 1f4a6d9..a20d1db 100644 (file)
@@ -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(
index 71dc694..484f923 100644 (file)
@@ -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)
-
index c33a9dd..6f6f38b 100644 (file)
@@ -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
index 1a0200f..22efd4f 100644 (file)
@@ -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)
index 67dfb1d..eedba4f 100644 (file)
@@ -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
index 53bc197..5d57622 100644 (file)
@@ -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)
index 85f843d..7c574f5 100644 (file)
@@ -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)
-
index fac6040..18f8ba4 100644 (file)
@@ -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)
index 2c1e04c..92cc0dc 100644 (file)
@@ -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)
 
index 16d1d92..2e63093 100644 (file)
@@ -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)
index dcc2fde..ab1d9f5 100644 (file)
@@ -1,7 +1,6 @@
 
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
-
 spec2def(comcat.dll comcat.spec)
 
 list(APPEND SOURCE
index f9091be..bac88d4 100644 (file)
@@ -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)
-
index 8030241..3d9fe22 100644 (file)
@@ -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
index fc8b648..71d108f 100644 (file)
@@ -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)
index 09f53cd..e389c39 100644 (file)
@@ -1,7 +1,6 @@
 
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
-
 spec2def(cryptdlg.dll cryptdlg.spec)
 
 list(APPEND SOURCE
index 1810479..05bea5e 100644 (file)
@@ -1,7 +1,6 @@
 
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
-
 spec2def(cryptdll.dll cryptdll.spec)
 
 list(APPEND SOURCE
index ffbdf1a..7e8aa2d 100644 (file)
@@ -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
index 29262b8..ed6c538 100644 (file)
@@ -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
index d2c78a1..179e0ce 100644 (file)
@@ -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)
index cf585a9..517582e 100644 (file)
@@ -1,8 +1,6 @@
 
 add_definitions(-Dtzset=_tzset)
-
 include_directories(include)
-
 spec2def(dhcpcsvc.dll dhcpcsvc.spec ADD_IMPORTLIB)
 
 list(APPEND SOURCE 
index 0755c23..7a80b3c 100644 (file)
@@ -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)
-
index b9eb880..da4c1cc 100644 (file)
@@ -1,7 +1,6 @@
 
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
-
 spec2def(dwmapi.dll dwmapi.spec)
 
 list(APPEND SOURCE
index ffc3d84..13a61eb 100644 (file)
@@ -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)
-
index 9a2f8b8..5156254 100644 (file)
@@ -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)
index 6704f95..3a70195 100644 (file)
@@ -1,7 +1,6 @@
 
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
-
 spec2def(fusion.dll fusion.spec)
 
 list(APPEND SOURCE
index d8f69ad..2217df5 100644 (file)
@@ -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
index f6c0cfc..bb31454 100644 (file)
@@ -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)
index 2e967c9..8d199af 100644 (file)
@@ -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)
index 42147d3..e045cfe 100644 (file)
@@ -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)
index 8e6b85d..8bc7378 100644 (file)
@@ -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
index 562c38d..09efbb8 100644 (file)
@@ -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)
index fd2d400..fddf9b1 100644 (file)
@@ -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
index 4195057..7a79c8b 100644 (file)
@@ -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
index 8764eff..d5b0bb7 100644 (file)
@@ -1,7 +1,6 @@
 
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
-
 spec2def(inetmib1.dll inetmib1.spec)
 
 list(APPEND SOURCE
index 8d10337..fe5d272 100644 (file)
@@ -1,7 +1,6 @@
 
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
-
 spec2def(initpki.dll initpki.spec)
 
 list(APPEND SOURCE
index b358360..02197c4 100644 (file)
@@ -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)
index 3d15eb6..8fd8f48 100644 (file)
@@ -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)
-
index 944be95..dc5a2fe 100644 (file)
@@ -1,7 +1,6 @@
 
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
-
 spec2def(itircl.dll itircl.spec)
 
 list(APPEND SOURCE
index 5d1e100..534a3fe 100644 (file)
@@ -1,7 +1,6 @@
 
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
-
 spec2def(itss.dll itss.spec)
 
 list(APPEND SOURCE
index 6cb5c1d..8807475 100644 (file)
@@ -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)
index 4f7c63f..2987900 100644 (file)
@@ -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
index 30d7710..67835db 100644 (file)
@@ -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
index 1374941..4bd68b3 100644 (file)
@@ -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)
index 523841c..ec463c8 100644 (file)
@@ -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)
index 8c19456..d75d8d9 100644 (file)
@@ -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)
-
index 434f56c..0bafe1e 100644 (file)
@@ -1,7 +1,6 @@
 
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
-
 spec2def(mciavi32.dll mciavi32.spec)
 
 list(APPEND SOURCE
index 23a1f5a..1bd9084 100644 (file)
@@ -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)
index ad0628f..536681e 100644 (file)
@@ -1,7 +1,6 @@
 
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
-
 spec2def(mciqtz32.dll mciqtz32.spec)
 
 list(APPEND SOURCE
index c9cf715..8b40837 100644 (file)
@@ -1,7 +1,6 @@
 
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
-
 spec2def(mciseq.dll mciseq.spec)
 
 list(APPEND SOURCE
index bb7c3e1..c11ee1d 100644 (file)
@@ -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)
index a7a5472..4579e33 100644 (file)
@@ -1,7 +1,6 @@
 
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
-
 spec2def(mgmtapi.dll mgmtapi.spec)
 
 list(APPEND SOURCE
index 8a4a500..fa6f6ce 100644 (file)
@@ -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)
index 95c08f6..55ecce7 100644 (file)
@@ -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)
index 702cefd..60132a7 100644 (file)
@@ -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
index 1be60b0..30e265a 100644 (file)
@@ -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)
index 017e857..1e7bfd2 100644 (file)
@@ -1,7 +1,6 @@
 
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
-
 spec2def(mscms.dll mscms.spec)
 
 list(APPEND SOURCE
index e2ec45b..7c94521 100644 (file)
@@ -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
index 04ae9de..8436389 100644 (file)
@@ -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)
index 4fea5a1..00d4253 100644 (file)
@@ -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)
 
index a8316ca..3e52477 100644 (file)
@@ -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
index c798a2e..b0ee904 100644 (file)
@@ -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)
-
index 2ed1cda..f1a1abf 100644 (file)
@@ -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)
index 3b6c040..e41ca6b 100644 (file)
@@ -1,7 +1,6 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 add_definitions(-D__WINESRC__)
-
 spec2def(mspatcha.dll mspatcha.spec)
 
 list(APPEND SOURCE
index 53a4096..b0fee51 100644 (file)
@@ -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)
-
index c1087de..fd74064 100644 (file)
@@ -1,7 +1,6 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 add_definitions(-D__WINESRC__)
-
 spec2def(mssign32.dll mssign32.spec)
 
 list(APPEND SOURCE
index 5860512..321ae4e 100644 (file)
@@ -1,7 +1,6 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 add_definitions(-D__WINESRC__)
-
 spec2def(mssip32.dll mssip32.spec)
 
 list(APPEND SOURCE
index dc114a5..707170e 100644 (file)
@@ -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)
index 7b4e548..032794b 100644 (file)
@@ -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)
index ac10be5..dbf8c34 100644 (file)
@@ -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)
-
index a5cc03c..2b55671 100644 (file)
@@ -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)
index 5f882c4..7753fa4 100644 (file)
@@ -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)
index 704d094..cf5c9f7 100644 (file)
@@ -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)
index 8edc44c..ce39d63 100644 (file)
@@ -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)
index bdc2c19..17b6c46 100644 (file)
@@ -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)
index 334f617..c5eb75c 100644 (file)
@@ -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)
-
index 2072386..a2816b2 100644 (file)
@@ -1,3 +1,4 @@
+
 remove_definitions(-D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x600)
 
index 4a0f4c7..593dbd2 100644 (file)
@@ -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)
index 9969950..7e8c13e 100644 (file)
@@ -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)
-
index 55b1878..5bb63ff 100644 (file)
@@ -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)
index 8416d1d..21773ad 100644 (file)
@@ -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)
index 1890871..6255385 100644 (file)
@@ -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)
index 29196d5..2f52596 100644 (file)
@@ -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)
index e7fc09f..26fb063 100644 (file)
@@ -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)
index 6905e45..cd819ce 100644 (file)
@@ -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)
index 807f802..3c02364 100644 (file)
@@ -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)
index 8bcbdc9..720015e 100644 (file)
@@ -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
index 2d45688..b30491a 100644 (file)
@@ -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)
index cb27dd1..b96852d 100644 (file)
@@ -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)
index 2056f49..dd2dddd 100644 (file)
@@ -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)
index cca66c1..44146f9 100644 (file)
@@ -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)
index 43d12d4..a58d732 100644 (file)
@@ -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)
index b8b65da..e75e4e8 100644 (file)
@@ -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)
index 0ef7911..24959d6 100644 (file)
@@ -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)
index ef17487..100dcf5 100644 (file)
@@ -1,6 +1,5 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/winsock)
-
 spec2def(rasadhlp.dll rasadhlp.spec)
 
 list(APPEND SOURCE
index 18c4baa..547e754 100644 (file)
@@ -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)
index 4592d25..3433ad4 100644 (file)
@@ -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)
index 85207ed..9f2e6de 100644 (file)
@@ -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)
index 644eae6..2120062 100644 (file)
@@ -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)
index bb9d34f..fc93404 100644 (file)
@@ -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)
index 696a3bd..1de6bd1 100644 (file)
@@ -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)
 
index 874adc1..20d6774 100644 (file)
@@ -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)
-
index e4c3f4b..0992ddf 100644 (file)
@@ -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)
index 639e153..350c8d8 100644 (file)
@@ -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)
index b9dae3f..d9713f9 100644 (file)
@@ -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)
index ea8a53d..23e75c7 100644 (file)
@@ -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)
index 27a0746..9a6f9c6 100644 (file)
@@ -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)
index e973f7c..c52580f 100644 (file)
@@ -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)
index 1da24dd..c923f33 100644 (file)
@@ -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)
index 1b4648b..e544454 100644 (file)
@@ -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)
-
index dd4c3ac..e1b77cc 100644 (file)
@@ -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)
index cef2c96..2caf1ec 100644 (file)
@@ -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)
index 8e6d69d..c65d5d3 100644 (file)
@@ -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)
index 897e125..2e0babc 100644 (file)
@@ -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 "")
index 6c0b481..2698536 100644 (file)
@@ -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)
index 32dc199..ac92562 100644 (file)
@@ -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)
index 6476400..b0669c2 100644 (file)
@@ -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)
index 8a18c50..eef6c63 100644 (file)
@@ -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)
index 9548798..432af9d 100644 (file)
@@ -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)
index 4b7fa84..927efb5 100644 (file)
@@ -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)
index e57826e..93c9f2c 100644 (file)
@@ -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)
index 818df41..c658637 100644 (file)
@@ -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)
index 18d1b1c..ca4d87b 100644 (file)
@@ -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)
index 0d1cc22..7d18d43 100644 (file)
@@ -1,7 +1,6 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 add_definitions(-D__WINESRC__)
-
 spec2def(url.dll url.spec)
 
 list(APPEND SOURCE
index 3fe251b..cef101a 100644 (file)
@@ -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)
index f23bc04..0da282b 100644 (file)
@@ -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)
index bb583b8..9c9ef55 100644 (file)
@@ -20,7 +20,6 @@ if(MSVC)
 endif()
 
 spec2def(windowscodecs.dll windowscodecs.spec ADD_IMPORTLIB)
-
 add_rpcproxy_files(windowscodecs_wincodec.idl)
 
 list(APPEND SOURCE
index 6977a9d..830d8e6 100644 (file)
@@ -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)
index b25a72d..a4980b8 100644 (file)
@@ -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)
index 2058bf1..4d7ef0d 100644 (file)
@@ -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)
index 0c59c51..5be73d9 100644 (file)
@@ -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)
index 18ddfbc..a025f14 100644 (file)
@@ -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)
-
index 8c356b0..233b303 100644 (file)
@@ -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)
index 7d37a29..0519d44 100644 (file)
@@ -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)
index 0cded31..a7ad964 100644 (file)
@@ -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)
-
index 250439a..7754c96 100644 (file)
@@ -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
index 277270a..d041224 100644 (file)
@@ -1,6 +1,5 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/winsock)
-
 spec2def(ws2help.dll ws2help.spec ADD_IMPORTLIB)
 
 list(APPEND SOURCE
index ea11099..d7fc156 100644 (file)
@@ -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)
index e0c94ac..41439e9 100644 (file)
@@ -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)
index 0f09ad6..2826ec7 100644 (file)
@@ -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)
index 6628ffd..8b1321b 100644 (file)
@@ -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)
-
index b4137ce..ab4de2a 100644 (file)
@@ -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)
index bb9236c..2aaf82c 100644 (file)
@@ -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)
index d4f8baf..5c69e73 100644 (file)
@@ -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)
index 3293f04..f54fe19 100644 (file)
@@ -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)
index b3f3b2d..830eb40 100644 (file)
@@ -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)
index a0bea76..e112069 100644 (file)
@@ -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)
-
index ff112bb..bf13da1 100644 (file)
@@ -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)
index f85e15b..b394648 100644 (file)
@@ -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)
index fa4e3bd..d17325c 100644 (file)
@@ -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)
index 389f6a3..ae1bd44 100644 (file)
@@ -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)
index 9bec1b4..d8aaaae 100644 (file)
@@ -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)
index 40f0988..087f9e3 100644 (file)
@@ -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)
index e25e5c8..eac55f2 100644 (file)
@@ -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)
index 7878212..350a2c6 100644 (file)
@@ -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)
index ed4875f..707f99d 100644 (file)
@@ -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)
index ab90492..218d908 100644 (file)
@@ -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)
-
index d23d599..a9e5300 100644 (file)
@@ -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)
index 3b5f929..1c23d7d 100644 (file)
@@ -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)
index 349abc8..9ec04ea 100644 (file)
@@ -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)
index f8667ef..7a5f48e 100644 (file)
@@ -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)
index e0ba396..6a7e734 100644 (file)
@@ -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)