[CMAKE]
authorJérôme Gardou <jerome.gardou@reactos.org>
Sat, 14 May 2011 13:49:39 +0000 (13:49 +0000)
committerJérôme Gardou <jerome.gardou@reactos.org>
Sat, 14 May 2011 13:49:39 +0000 (13:49 +0000)
Completely refactor bootcd generation
  - one macro (à la cmake's install) to rule them all, to make your life simpler and have build files cleaner
  - Completely rehaul the bootcd tree : now you have in it some minimal reactos system
  - reflect those changes in setupldr
No livecd yet!

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

556 files changed:
CMakeLists.txt
CMakeMacros.cmake
base/applications/cacls/CMakeLists.txt
base/applications/calc/CMakeLists.txt
base/applications/charmap/CMakeLists.txt
base/applications/cmdutils/dbgprint/CMakeLists.txt
base/applications/cmdutils/doskey/CMakeLists.txt
base/applications/cmdutils/find/CMakeLists.txt
base/applications/cmdutils/hostname/CMakeLists.txt
base/applications/cmdutils/lodctr/CMakeLists.txt
base/applications/cmdutils/more/CMakeLists.txt
base/applications/cmdutils/reg/CMakeLists.txt
base/applications/cmdutils/xcopy/CMakeLists.txt
base/applications/control/CMakeLists.txt
base/applications/dxdiag/CMakeLists.txt
base/applications/extrac32/CMakeLists.txt
base/applications/findstr/CMakeLists.txt
base/applications/fontview/CMakeLists.txt
base/applications/games/solitaire/CMakeLists.txt
base/applications/games/spider/CMakeLists.txt
base/applications/games/winmine/CMakeLists.txt
base/applications/hh/CMakeLists.txt
base/applications/iexplore/CMakeLists.txt
base/applications/kbswitch/CMakeLists.txt
base/applications/kbswitch/kbsdll/CMakeLists.txt
base/applications/logoff/CMakeLists.txt
base/applications/magnify/CMakeLists.txt
base/applications/mplay32/CMakeLists.txt
base/applications/msconfig/CMakeLists.txt
base/applications/mscutils/devmgmt/CMakeLists.txt
base/applications/mscutils/eventvwr/CMakeLists.txt
base/applications/mscutils/servman/CMakeLists.txt
base/applications/mspaint/CMakeLists.txt
base/applications/mstsc/CMakeLists.txt
base/applications/network/arp/CMakeLists.txt
base/applications/network/dwnl/CMakeLists.txt
base/applications/network/finger/CMakeLists.txt
base/applications/network/ftp/CMakeLists.txt
base/applications/network/ipconfig/CMakeLists.txt
base/applications/network/net/CMakeLists.txt
base/applications/network/netstat/CMakeLists.txt
base/applications/network/nslookup/CMakeLists.txt
base/applications/network/ping/CMakeLists.txt
base/applications/network/route/CMakeLists.txt
base/applications/network/telnet/CMakeLists.txt
base/applications/network/tracert/CMakeLists.txt
base/applications/network/whois/CMakeLists.txt
base/applications/notepad/CMakeLists.txt
base/applications/rapps/CMakeLists.txt
base/applications/regedit/CMakeLists.txt
base/applications/regedt32/CMakeLists.txt
base/applications/sc/CMakeLists.txt
base/applications/screensavers/3dtext/CMakeLists.txt
base/applications/screensavers/logon/CMakeLists.txt
base/applications/shutdown/CMakeLists.txt
base/applications/sndrec32/CMakeLists.txt
base/applications/sndvol32/CMakeLists.txt
base/applications/taskmgr/CMakeLists.txt
base/applications/winhlp32/CMakeLists.txt
base/applications/winver/CMakeLists.txt
base/applications/wordpad/CMakeLists.txt
base/applications/write/CMakeLists.txt
base/services/audiosrv/CMakeLists.txt
base/services/eventlog/CMakeLists.txt
base/services/rpcss/CMakeLists.txt
base/services/spoolsv/CMakeLists.txt
base/services/svchost/CMakeLists.txt
base/services/tcpsvcs/CMakeLists.txt
base/services/telnetd/CMakeLists.txt
base/services/umpnpmgr/CMakeLists.txt
base/services/wlansvc/CMakeLists.txt
base/setup/reactos/CMakeLists.txt
base/setup/setup/CMakeLists.txt
base/setup/usetup/CMakeLists.txt
base/setup/usetup/filesup.c
base/setup/usetup/interface/usetup.c
base/setup/vmwinst/CMakeLists.txt
base/setup/welcome/CMakeLists.txt
base/shell/cmd/CMakeLists.txt
base/shell/explorer-new/CMakeLists.txt
base/shell/explorer/CMakeLists.txt
base/shell/explorer/notifyhook/CMakeLists.txt
base/system/autochk/CMakeLists.txt
base/system/bootok/CMakeLists.txt
base/system/expand/CMakeLists.txt
base/system/format/CMakeLists.txt
base/system/lsass/CMakeLists.txt
base/system/msiexec/CMakeLists.txt
base/system/regsvr32/CMakeLists.txt
base/system/rundll32/CMakeLists.txt
base/system/runonce/CMakeLists.txt
base/system/services/CMakeLists.txt
base/system/smss/CMakeLists.txt
base/system/subst/CMakeLists.txt
base/system/userinit/CMakeLists.txt
base/system/winlogon/CMakeLists.txt
boot/CMakeLists.txt
boot/bootdata/CMakeLists.txt [new file with mode: 0644]
boot/bootdata/packages/CMakeLists.txt [new file with mode: 0644]
boot/bootdata/packages/reactos.dff.in
boot/bootdata/txtsetup.sif
boot/freeldr/bootsect/CMakeLists.txt
boot/freeldr/freeldr/CMakeLists.txt
boot/freeldr/freeldr/windows/setupldr2.c
dll/3rdparty/dxtn/CMakeLists.txt
dll/3rdparty/libjpeg/CMakeLists.txt
dll/3rdparty/libpng/CMakeLists.txt
dll/3rdparty/libtiff/CMakeLists.txt
dll/3rdparty/libxslt/CMakeLists.txt
dll/3rdparty/mesa32/CMakeLists.txt
dll/cpl/access/CMakeLists.txt
dll/cpl/appwiz/CMakeLists.txt
dll/cpl/console/CMakeLists.txt
dll/cpl/desk/CMakeLists.txt
dll/cpl/hdwwiz/CMakeLists.txt
dll/cpl/input/CMakeLists.txt
dll/cpl/intl/CMakeLists.txt
dll/cpl/joy/CMakeLists.txt
dll/cpl/main/CMakeLists.txt
dll/cpl/mmsys/CMakeLists.txt
dll/cpl/ncpa/CMakeLists.txt
dll/cpl/odbccp32/CMakeLists.txt
dll/cpl/powercfg/CMakeLists.txt
dll/cpl/sysdm/CMakeLists.txt
dll/cpl/telephon/CMakeLists.txt
dll/cpl/timedate/CMakeLists.txt
dll/cpl/usrmgr/CMakeLists.txt
dll/directx/amstream/CMakeLists.txt
dll/directx/d3d8thk/CMakeLists.txt
dll/directx/devenum/CMakeLists.txt
dll/directx/dinput/CMakeLists.txt
dll/directx/dinput8/CMakeLists.txt
dll/directx/dmusic/CMakeLists.txt
dll/directx/dplay/CMakeLists.txt
dll/directx/dplayx/CMakeLists.txt
dll/directx/dsound/CMakeLists.txt
dll/directx/dxdiagn/CMakeLists.txt
dll/directx/ksproxy/CMakeLists.txt
dll/directx/ksuser/CMakeLists.txt
dll/directx/msdmo/CMakeLists.txt
dll/directx/qedit/CMakeLists.txt
dll/directx/quartz/CMakeLists.txt
dll/directx/wine/d3d8/CMakeLists.txt
dll/directx/wine/d3d9/CMakeLists.txt
dll/directx/wine/d3dx9_24/CMakeLists.txt
dll/directx/wine/d3dx9_25/CMakeLists.txt
dll/directx/wine/d3dx9_26/CMakeLists.txt
dll/directx/wine/d3dx9_27/CMakeLists.txt
dll/directx/wine/d3dx9_28/CMakeLists.txt
dll/directx/wine/d3dx9_29/CMakeLists.txt
dll/directx/wine/d3dx9_30/CMakeLists.txt
dll/directx/wine/d3dx9_31/CMakeLists.txt
dll/directx/wine/d3dx9_32/CMakeLists.txt
dll/directx/wine/d3dx9_33/CMakeLists.txt
dll/directx/wine/d3dx9_34/CMakeLists.txt
dll/directx/wine/d3dx9_35/CMakeLists.txt
dll/directx/wine/d3dx9_36/CMakeLists.txt
dll/directx/wine/d3dx9_37/CMakeLists.txt
dll/directx/wine/d3dx9_38/CMakeLists.txt
dll/directx/wine/d3dx9_39/CMakeLists.txt
dll/directx/wine/d3dx9_40/CMakeLists.txt
dll/directx/wine/d3dx9_41/CMakeLists.txt
dll/directx/wine/d3dx9_42/CMakeLists.txt
dll/directx/wine/ddraw/CMakeLists.txt
dll/directx/wine/wined3d/CMakeLists.txt
dll/keyboard/kbda1/CMakeLists.txt
dll/keyboard/kbda2/CMakeLists.txt
dll/keyboard/kbda3/CMakeLists.txt
dll/keyboard/kbdal/CMakeLists.txt
dll/keyboard/kbdarme/CMakeLists.txt
dll/keyboard/kbdarmw/CMakeLists.txt
dll/keyboard/kbdaze/CMakeLists.txt
dll/keyboard/kbdazel/CMakeLists.txt
dll/keyboard/kbdbe/CMakeLists.txt
dll/keyboard/kbdbga/CMakeLists.txt
dll/keyboard/kbdbgm/CMakeLists.txt
dll/keyboard/kbdbgt/CMakeLists.txt
dll/keyboard/kbdblr/CMakeLists.txt
dll/keyboard/kbdbr/CMakeLists.txt
dll/keyboard/kbdbur/CMakeLists.txt
dll/keyboard/kbdcan/CMakeLists.txt
dll/keyboard/kbdcr/CMakeLists.txt
dll/keyboard/kbdcz/CMakeLists.txt
dll/keyboard/kbdcz1/CMakeLists.txt
dll/keyboard/kbdda/CMakeLists.txt
dll/keyboard/kbddv/CMakeLists.txt
dll/keyboard/kbdes/CMakeLists.txt
dll/keyboard/kbdest/CMakeLists.txt
dll/keyboard/kbdfc/CMakeLists.txt
dll/keyboard/kbdfi/CMakeLists.txt
dll/keyboard/kbdfr/CMakeLists.txt
dll/keyboard/kbdgeo/CMakeLists.txt
dll/keyboard/kbdgerg/CMakeLists.txt
dll/keyboard/kbdgneo/CMakeLists.txt
dll/keyboard/kbdgr/CMakeLists.txt
dll/keyboard/kbdgrist/CMakeLists.txt
dll/keyboard/kbdhe/CMakeLists.txt
dll/keyboard/kbdheb/CMakeLists.txt
dll/keyboard/kbdhu/CMakeLists.txt
dll/keyboard/kbdic/CMakeLists.txt
dll/keyboard/kbdinasa/CMakeLists.txt
dll/keyboard/kbdinben/CMakeLists.txt
dll/keyboard/kbdindev/CMakeLists.txt
dll/keyboard/kbdinguj/CMakeLists.txt
dll/keyboard/kbdinmal/CMakeLists.txt
dll/keyboard/kbdir/CMakeLists.txt
dll/keyboard/kbdit/CMakeLists.txt
dll/keyboard/kbdja/CMakeLists.txt
dll/keyboard/kbdkaz/CMakeLists.txt
dll/keyboard/kbdko/CMakeLists.txt
dll/keyboard/kbdla/CMakeLists.txt
dll/keyboard/kbdlt1/CMakeLists.txt
dll/keyboard/kbdlv/CMakeLists.txt
dll/keyboard/kbdmac/CMakeLists.txt
dll/keyboard/kbdne/CMakeLists.txt
dll/keyboard/kbdno/CMakeLists.txt
dll/keyboard/kbdpl1/CMakeLists.txt
dll/keyboard/kbdpo/CMakeLists.txt
dll/keyboard/kbdro/CMakeLists.txt
dll/keyboard/kbdru/CMakeLists.txt
dll/keyboard/kbdru1/CMakeLists.txt
dll/keyboard/kbdsg/CMakeLists.txt
dll/keyboard/kbdsk/CMakeLists.txt
dll/keyboard/kbdsk1/CMakeLists.txt
dll/keyboard/kbdsw/CMakeLists.txt
dll/keyboard/kbdtat/CMakeLists.txt
dll/keyboard/kbdth0/CMakeLists.txt
dll/keyboard/kbdth1/CMakeLists.txt
dll/keyboard/kbdth2/CMakeLists.txt
dll/keyboard/kbdth3/CMakeLists.txt
dll/keyboard/kbdtuf/CMakeLists.txt
dll/keyboard/kbdtuq/CMakeLists.txt
dll/keyboard/kbduk/CMakeLists.txt
dll/keyboard/kbdur/CMakeLists.txt
dll/keyboard/kbdurs/CMakeLists.txt
dll/keyboard/kbdus/CMakeLists.txt
dll/keyboard/kbdusa/CMakeLists.txt
dll/keyboard/kbdusl/CMakeLists.txt
dll/keyboard/kbdusr/CMakeLists.txt
dll/keyboard/kbdusx/CMakeLists.txt
dll/keyboard/kbduzb/CMakeLists.txt
dll/keyboard/kbdvntc/CMakeLists.txt
dll/keyboard/kbdycc/CMakeLists.txt
dll/keyboard/kbdycl/CMakeLists.txt
dll/nls/idndl/CMakeLists.txt
dll/ntdll/CMakeLists.txt
dll/shellext/deskadp/CMakeLists.txt
dll/shellext/deskmon/CMakeLists.txt
dll/shellext/devcpux/CMakeLists.txt
dll/shellext/fontext/CMakeLists.txt
dll/shellext/slayer/CMakeLists.txt
dll/win32/acledit/CMakeLists.txt
dll/win32/aclui/CMakeLists.txt
dll/win32/activeds/CMakeLists.txt
dll/win32/actxprxy/CMakeLists.txt
dll/win32/advapi32/CMakeLists.txt
dll/win32/advpack/CMakeLists.txt
dll/win32/atl/CMakeLists.txt
dll/win32/authz/CMakeLists.txt
dll/win32/avicap32/CMakeLists.txt
dll/win32/avifil32/CMakeLists.txt
dll/win32/batt/CMakeLists.txt
dll/win32/bcrypt/CMakeLists.txt
dll/win32/beepmidi/CMakeLists.txt
dll/win32/browseui/CMakeLists.txt
dll/win32/cabinet/CMakeLists.txt
dll/win32/cards/CMakeLists.txt
dll/win32/cfgmgr32/CMakeLists.txt
dll/win32/clusapi/CMakeLists.txt
dll/win32/comcat/CMakeLists.txt
dll/win32/comctl32/CMakeLists.txt
dll/win32/comdlg32/CMakeLists.txt
dll/win32/compstui/CMakeLists.txt
dll/win32/credui/CMakeLists.txt
dll/win32/crtdll/CMakeLists.txt
dll/win32/crypt32/CMakeLists.txt
dll/win32/cryptdlg/CMakeLists.txt
dll/win32/cryptdll/CMakeLists.txt
dll/win32/cryptnet/CMakeLists.txt
dll/win32/cryptui/CMakeLists.txt
dll/win32/dbghelp/CMakeLists.txt
dll/win32/dciman32/CMakeLists.txt
dll/win32/devmgr/CMakeLists.txt
dll/win32/dhcpcsvc/CMakeLists.txt
dll/win32/dnsapi/CMakeLists.txt
dll/win32/dwmapi/CMakeLists.txt
dll/win32/faultrep/CMakeLists.txt
dll/win32/fmifs/CMakeLists.txt
dll/win32/fusion/CMakeLists.txt
dll/win32/gdi32/CMakeLists.txt
dll/win32/gdiplus/CMakeLists.txt
dll/win32/getuname/CMakeLists.txt
dll/win32/glu32/CMakeLists.txt
dll/win32/hhctrl.ocx/CMakeLists.txt
dll/win32/hid/CMakeLists.txt
dll/win32/hlink/CMakeLists.txt
dll/win32/hnetcfg/CMakeLists.txt
dll/win32/httpapi/CMakeLists.txt
dll/win32/iccvid/CMakeLists.txt
dll/win32/icmp/CMakeLists.txt
dll/win32/imaadp32.acm/CMakeLists.txt
dll/win32/imagehlp/CMakeLists.txt
dll/win32/imm32/CMakeLists.txt
dll/win32/inetcomm/CMakeLists.txt
dll/win32/inetmib1/CMakeLists.txt
dll/win32/initpki/CMakeLists.txt
dll/win32/inseng/CMakeLists.txt
dll/win32/iphlpapi/CMakeLists.txt
dll/win32/itircl/CMakeLists.txt
dll/win32/itss/CMakeLists.txt
dll/win32/jscript/CMakeLists.txt
dll/win32/kernel32/CMakeLists.txt
dll/win32/loadperf/CMakeLists.txt
dll/win32/localspl/CMakeLists.txt
dll/win32/localui/CMakeLists.txt
dll/win32/lpk/CMakeLists.txt
dll/win32/lsasrv/CMakeLists.txt
dll/win32/lz32/CMakeLists.txt
dll/win32/mapi32/CMakeLists.txt
dll/win32/mciavi32/CMakeLists.txt
dll/win32/mcicda/CMakeLists.txt
dll/win32/mciqtz32/CMakeLists.txt
dll/win32/mciseq/CMakeLists.txt
dll/win32/mciwave/CMakeLists.txt
dll/win32/mlang/CMakeLists.txt
dll/win32/mmdrv/CMakeLists.txt
dll/win32/modemui/CMakeLists.txt
dll/win32/mpr/CMakeLists.txt
dll/win32/mprapi/CMakeLists.txt
dll/win32/msacm32/CMakeLists.txt
dll/win32/msacm32/msacm32.drv/CMakeLists.txt
dll/win32/msadp32.acm/CMakeLists.txt
dll/win32/msafd/CMakeLists.txt
dll/win32/mscat32/CMakeLists.txt
dll/win32/mscms/CMakeLists.txt
dll/win32/mscoree/CMakeLists.txt
dll/win32/msctf/CMakeLists.txt
dll/win32/msftedit/CMakeLists.txt
dll/win32/msg711.acm/CMakeLists.txt
dll/win32/msgina/CMakeLists.txt
dll/win32/msgsm32.acm/CMakeLists.txt
dll/win32/mshtml.tlb/CMakeLists.txt
dll/win32/mshtml/CMakeLists.txt
dll/win32/msi/CMakeLists.txt
dll/win32/msimg32/CMakeLists.txt
dll/win32/msimtf/CMakeLists.txt
dll/win32/msisip/CMakeLists.txt
dll/win32/msisys.ocx/CMakeLists.txt
dll/win32/msnet32/CMakeLists.txt
dll/win32/msrle32/CMakeLists.txt
dll/win32/mssign32/CMakeLists.txt
dll/win32/mssip32/CMakeLists.txt
dll/win32/mstask/CMakeLists.txt
dll/win32/msvcrt/CMakeLists.txt
dll/win32/msvcrt20/CMakeLists.txt
dll/win32/msvcrt40/CMakeLists.txt
dll/win32/msvfw32/CMakeLists.txt
dll/win32/msvidc32/CMakeLists.txt
dll/win32/mswsock/CMakeLists.txt
dll/win32/msxml3/CMakeLists.txt
dll/win32/nddeapi/CMakeLists.txt
dll/win32/netapi32/CMakeLists.txt
dll/win32/netcfgx/CMakeLists.txt
dll/win32/netevent/CMakeLists.txt
dll/win32/netid/CMakeLists.txt
dll/win32/netshell/CMakeLists.txt
dll/win32/newdev/CMakeLists.txt
dll/win32/ntdsapi/CMakeLists.txt
dll/win32/ntlanman/CMakeLists.txt
dll/win32/ntmarta/CMakeLists.txt
dll/win32/ntprint/CMakeLists.txt
dll/win32/objsel/CMakeLists.txt
dll/win32/odbc32/CMakeLists.txt
dll/win32/odbccp32/CMakeLists.txt
dll/win32/ole32/CMakeLists.txt
dll/win32/oleacc/CMakeLists.txt
dll/win32/oleaut32/CMakeLists.txt
dll/win32/olecli32/CMakeLists.txt
dll/win32/oledlg/CMakeLists.txt
dll/win32/olepro32/CMakeLists.txt
dll/win32/olesvr32/CMakeLists.txt
dll/win32/olethk32/CMakeLists.txt
dll/win32/opengl32/CMakeLists.txt
dll/win32/pdh/CMakeLists.txt
dll/win32/pidgen/CMakeLists.txt
dll/win32/powrprof/CMakeLists.txt
dll/win32/printui/CMakeLists.txt
dll/win32/psapi/CMakeLists.txt
dll/win32/pstorec/CMakeLists.txt
dll/win32/qmgr/CMakeLists.txt
dll/win32/qmgrprxy/CMakeLists.txt
dll/win32/query/CMakeLists.txt
dll/win32/rasadhlp/CMakeLists.txt
dll/win32/rasapi32/CMakeLists.txt
dll/win32/rasdlg/CMakeLists.txt
dll/win32/rasman/CMakeLists.txt
dll/win32/resutils/CMakeLists.txt
dll/win32/riched20/CMakeLists.txt
dll/win32/riched32/CMakeLists.txt
dll/win32/rpcrt4/CMakeLists.txt
dll/win32/rsabase/CMakeLists.txt
dll/win32/rsaenh/CMakeLists.txt
dll/win32/samlib/CMakeLists.txt
dll/win32/samsrv/CMakeLists.txt
dll/win32/sccbase/CMakeLists.txt
dll/win32/schannel/CMakeLists.txt
dll/win32/secur32/CMakeLists.txt
dll/win32/security/CMakeLists.txt
dll/win32/sensapi/CMakeLists.txt
dll/win32/serialui/CMakeLists.txt
dll/win32/setupapi/CMakeLists.txt
dll/win32/sfc/CMakeLists.txt
dll/win32/sfc_os/CMakeLists.txt
dll/win32/shdoclc/CMakeLists.txt
dll/win32/shdocvw/CMakeLists.txt
dll/win32/shell32/CMakeLists.txt
dll/win32/shfolder/CMakeLists.txt
dll/win32/shimgvw/CMakeLists.txt
dll/win32/shlwapi/CMakeLists.txt
dll/win32/slbcsp/CMakeLists.txt
dll/win32/smdll/CMakeLists.txt
dll/win32/sndblst/CMakeLists.txt
dll/win32/snmpapi/CMakeLists.txt
dll/win32/softpub/CMakeLists.txt
dll/win32/spoolss/CMakeLists.txt
dll/win32/srclient/CMakeLists.txt
dll/win32/stdole2.tlb/CMakeLists.txt
dll/win32/stdole32.tlb/CMakeLists.txt
dll/win32/sti/CMakeLists.txt
dll/win32/sxs/CMakeLists.txt
dll/win32/syssetup/CMakeLists.txt
dll/win32/t2embed/CMakeLists.txt
dll/win32/tapi32/CMakeLists.txt
dll/win32/tapiui/CMakeLists.txt
dll/win32/traffic/CMakeLists.txt
dll/win32/twain_32/CMakeLists.txt
dll/win32/uext2/CMakeLists.txt
dll/win32/ufat/CMakeLists.txt
dll/win32/ufatx/CMakeLists.txt
dll/win32/unicows/CMakeLists.txt
dll/win32/untfs/CMakeLists.txt
dll/win32/updspapi/CMakeLists.txt
dll/win32/url/CMakeLists.txt
dll/win32/urlmon/CMakeLists.txt
dll/win32/user32/CMakeLists.txt
dll/win32/userenv/CMakeLists.txt
dll/win32/usp10/CMakeLists.txt
dll/win32/uxtheme/CMakeLists.txt
dll/win32/vdmdbg/CMakeLists.txt
dll/win32/version/CMakeLists.txt
dll/win32/wdmaud.drv/CMakeLists.txt
dll/win32/windowscodecs/CMakeLists.txt
dll/win32/winemp3.acm/CMakeLists.txt
dll/win32/winfax/CMakeLists.txt
dll/win32/wing32/CMakeLists.txt
dll/win32/winhttp/CMakeLists.txt
dll/win32/wininet/CMakeLists.txt
dll/win32/winmm/CMakeLists.txt
dll/win32/winmm/midimap/CMakeLists.txt
dll/win32/winspool/CMakeLists.txt
dll/win32/winsta/CMakeLists.txt
dll/win32/wintrust/CMakeLists.txt
dll/win32/wlanapi/CMakeLists.txt
dll/win32/wldap32/CMakeLists.txt
dll/win32/wmi/CMakeLists.txt
dll/win32/ws2_32/CMakeLists.txt
dll/win32/ws2_32_new/CMakeLists.txt
dll/win32/ws2help/CMakeLists.txt
dll/win32/wshirda/CMakeLists.txt
dll/win32/wshtcpip/CMakeLists.txt
dll/win32/wsock32/CMakeLists.txt
dll/win32/wtsapi32/CMakeLists.txt
dll/win32/wuapi/CMakeLists.txt
dll/win32/xinput1_1/CMakeLists.txt
dll/win32/xinput1_2/CMakeLists.txt
dll/win32/xinput1_3/CMakeLists.txt
dll/win32/xinput9_1_0/CMakeLists.txt
dll/win32/xmllite/CMakeLists.txt
drivers/base/beep/CMakeLists.txt
drivers/base/bootvid/CMakeLists.txt
drivers/base/kdcom/CMakeLists.txt
drivers/base/nmidebug/CMakeLists.txt
drivers/base/null/CMakeLists.txt
drivers/battery/battc/CMakeLists.txt
drivers/bus/acpi/CMakeLists.txt
drivers/bus/acpi/cmbatt/CMakeLists.txt
drivers/bus/acpi/compbatt/CMakeLists.txt
drivers/bus/isapnp/CMakeLists.txt
drivers/bus/pci/CMakeLists.txt
drivers/bus/pcix/CMakeLists.txt
drivers/bus/pcmcia/CMakeLists.txt
drivers/directx/dxapi/CMakeLists.txt
drivers/directx/dxg/CMakeLists.txt
drivers/directx/dxgthk/CMakeLists.txt
drivers/filesystems/cdfs/CMakeLists.txt
drivers/filesystems/ext2/CMakeLists.txt
drivers/filesystems/fastfat/CMakeLists.txt
drivers/filesystems/fs_rec/CMakeLists.txt
drivers/filesystems/msfs/CMakeLists.txt
drivers/filesystems/mup/CMakeLists.txt
drivers/filesystems/npfs/CMakeLists.txt
drivers/filesystems/ntfs/CMakeLists.txt
drivers/input/i8042prt/CMakeLists.txt
drivers/input/kbdclass/CMakeLists.txt
drivers/input/mouclass/CMakeLists.txt
drivers/input/sermouse/CMakeLists.txt
drivers/ksfilter/ks/CMakeLists.txt
drivers/ksfilter/swenum/CMakeLists.txt
drivers/network/afd/CMakeLists.txt
drivers/network/dd/ne2000/CMakeLists.txt
drivers/network/dd/pcnet/CMakeLists.txt
drivers/network/ndis/CMakeLists.txt
drivers/network/tcpip/CMakeLists.txt
drivers/network/tdi/CMakeLists.txt
drivers/serial/serenum/CMakeLists.txt
drivers/serial/serial/CMakeLists.txt
drivers/setup/blue/CMakeLists.txt
drivers/storage/class/cdrom/CMakeLists.txt
drivers/storage/class/class2/CMakeLists.txt
drivers/storage/class/disk/CMakeLists.txt
drivers/storage/class/ramdisk/CMakeLists.txt
drivers/storage/classpnp/CMakeLists.txt
drivers/storage/floppy/CMakeLists.txt
drivers/storage/ide/atapi/CMakeLists.txt
drivers/storage/ide/pciide/CMakeLists.txt
drivers/storage/ide/pciidex/CMakeLists.txt
drivers/storage/ide/uniata/CMakeLists.txt
drivers/storage/port/buslogic/CMakeLists.txt
drivers/storage/scsiport/CMakeLists.txt
drivers/usb/nt4compat/usbdriver/CMakeLists.txt
drivers/video/displays/framebuf/CMakeLists.txt
drivers/video/displays/vga/CMakeLists.txt
drivers/video/font/ftfd/CMakeLists.txt
drivers/video/miniport/vbe/CMakeLists.txt
drivers/video/miniport/vga/CMakeLists.txt
drivers/video/miniport/vga_new/CMakeLists.txt
drivers/video/videoprt/CMakeLists.txt
drivers/wdm/audio/backpln/portcls/CMakeLists.txt
drivers/wdm/audio/drm/drmk/CMakeLists.txt
drivers/wdm/audio/filters/kmixer/CMakeLists.txt
drivers/wdm/audio/legacy/wdmaud/CMakeLists.txt
drivers/wdm/audio/sysaudio/CMakeLists.txt
drivers/wmi/CMakeLists.txt
hal/halx86/CMakeLists.txt
media/CMakeLists.txt
media/fonts/CMakeLists.txt
media/inf/CMakeLists.txt
media/nls/CMakeLists.txt
media/vgafonts/CMakeLists.txt
ntoskrnl/CMakeLists.txt
ntoskrnl/ke/i386/cpu.c
subsystems/ntvdm/CMakeLists.txt
subsystems/win32/csrss/CMakeLists.txt
subsystems/win32/csrss/csrsrv/CMakeLists.txt
subsystems/win32/csrss/win32csr/CMakeLists.txt
subsystems/win32/win32k/CMakeLists.txt

index 0746eda..b62f464 100644 (file)
@@ -1,7 +1,7 @@
 
 cmake_minimum_required(VERSION 2.6)
 
-if(${CMAKE_VERSION} VERSION_GREATER "2.8.3")
+if(POLICY CMP0017)
     # Shadow cmake provided modules
     cmake_policy(SET CMP0017 OLD)
 endif()
@@ -13,6 +13,7 @@ include(include/reactos/version.cmake)
 
 # Don't escape preprocessor definition values added via add_definitions
 cmake_policy(SET CMP0005 OLD)
+cmake_policy(SET CMP0002 NEW)
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON)
@@ -71,6 +72,9 @@ else()
     set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
     set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY NEVER)
     set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE NEVER)
+    
+    #useful stuff!
+    include(CMakeParseArguments)
 
     # Do some cleanup
     file(REMOVE
@@ -185,8 +189,9 @@ else()
 
     include(baseaddress.cmake)
 
-    add_subdirectory(base)
+    #begin with boot so reactos_cab target is defined before all other modules
     add_subdirectory(boot)
+    add_subdirectory(base)
     add_subdirectory(dll)
     add_subdirectory(drivers)
     add_subdirectory(hal)
@@ -200,9 +205,6 @@ else()
 
     file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/importlibs)
 
-    #bootcd and livecd
-    include(ros_cd.cmake)
-
     add_dependency_footer()
 
 endif()
index 1e75108..3d4e3a2 100644 (file)
@@ -22,7 +22,6 @@ macro(CreateBootSectorTarget _target_name _asm_file _object_file)
         DEPENDS ${_asm_file})\r
     set_source_files_properties(${_object_file} PROPERTIES GENERATED TRUE)\r
     add_custom_target(${_target_name} ALL DEPENDS ${_object_file})\r
-    add_minicd(${_object_file} loader ${OBJECT_NAME})\r
 endmacro()\r
 \r
 else()\r
@@ -32,21 +31,6 @@ endmacro()
 \r
 endif()\r
 \r
-macro(add_minicd_target _targetname _dir) # optional parameter: _nameoncd\r
-    if("${ARGN}" STREQUAL "")\r
-        get_target_property(FILENAME ${_targetname} LOCATION)\r
-        get_filename_component(_nameoncd ${FILENAME} NAME)\r
-    else()\r
-        set(_nameoncd ${ARGN})\r
-    endif()\r
-\r
-    file(APPEND ${REACTOS_BINARY_DIR}/boot/ros_minicd_target.txt "${_targetname}\t${_dir}\t${_nameoncd}\n")\r
-endmacro()\r
-\r
-macro(add_minicd FILENAME _dir _nameoncd)\r
-    file(APPEND ${REACTOS_BINARY_DIR}/boot/ros_minicd.txt "${FILENAME}\t${_dir}\t${_nameoncd}\n")\r
-endmacro()\r
-\r
 macro(set_cpp)\r
     include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/c++/stlport)\r
     set(IS_CPP 1)\r
@@ -55,68 +39,6 @@ macro(set_cpp)
         -DNATIVE_C_INCLUDE=${REACTOS_SOURCE_DIR}/include/crt)\r
 endmacro()\r
 \r
-macro(add_livecd_target _targetname _dir )# optional parameter : _nameoncd\r
-    if("${ARGN}" STREQUAL "")\r
-        get_target_property(FILENAME ${_targetname} LOCATION)\r
-        get_filename_component(_nameoncd ${FILENAME} NAME)\r
-    else()\r
-        set(_nameoncd ${ARGN})\r
-    endif()\r
-\r
-    file(APPEND ${REACTOS_BINARY_DIR}/boot/ros_livecd_target.txt "${_targetname}\t${_dir}\t${_nameoncd}\n")\r
-endmacro()\r
-\r
-macro(add_livecd FILENAME _dir)# optional parameter : _nameoncd\r
-    if("${ARGN}" STREQUAL "")\r
-        get_filename_component(_nameoncd ${FILENAME} NAME)\r
-    else()\r
-        set(_nameoncd ${ARGN})\r
-    endif()\r
-    file(APPEND ${REACTOS_BINARY_DIR}/boot/ros_livecd.txt "${FILENAME}\t${_dir}\t${_nameoncd}\n")\r
-endmacro()\r
-\r
-macro(cab_to_dir _dir_num _var_name)\r
-#   1 = system32\r
-#   2 = system32\drivers\r
-#   3 = Fonts\r
-#   4 =\r
-#   5 = system32\drivers\etc\r
-#   6 = inf\r
-#   7 = bin\r
-#   8 = media\r
-    if(${_dir_num} STREQUAL "1")\r
-        set(${_var_name} "reactos/system32")\r
-    elseif(${_dir_num} STREQUAL "2")\r
-        set(${_var_name} "reactos/system32/drivers")\r
-    elseif(${_dir_num} STREQUAL "3")\r
-        set(${_var_name} "reactos/fonts")\r
-    elseif(${_dir_num} STREQUAL "4")\r
-        set(${_var_name} "reactos")\r
-    elseif(${_dir_num} STREQUAL "5")\r
-        set(${_var_name} "reactos/system32/drivers/etc")\r
-    elseif(${_dir_num} STREQUAL "6")\r
-        set(${_var_name} "reactos/inf")\r
-    elseif(${_dir_num} STREQUAL "7")\r
-        set(${_var_name} "reactos/bin")\r
-    elseif(${_dir_num} STREQUAL "8")\r
-        set(${_var_name} "reactos/system32/drivers")\r
-    else()\r
-        message(FATAL_ERROR "Wrong directory ${_dir_num}")\r
-    endif()\r
-endmacro()\r
-\r
-macro(add_cab_target _targetname _num )\r
-    file(APPEND ${REACTOS_BINARY_DIR}/boot/ros_cab_target.txt "${_targetname}\t${_num}\n")\r
-    cab_to_dir(${_num} _dir)\r
-    add_livecd_target(${_targetname} ${_dir})\r
-endmacro()\r
-\r
-macro(add_cab FILENAME _num)\r
-    file(APPEND ${REACTOS_BINARY_DIR}/boot/ros_cab.txt "${FILENAME}\t${_num}\n")\r
-    cab_to_dir(${_num} _dir)\r
-    add_livecd(${FILENAME} ${_dir})\r
-endmacro()\r
-\r
 macro(add_dependency_node _node)\r
     if(GENERATE_DEPENDENCY_GRAPH)\r
         get_target_property(_type ${_node} TYPE)\r
@@ -159,3 +81,75 @@ macro(add_message_headers)
     endforeach()\r
 endmacro()\r
 \r
+macro(dir_to_num dir var)\r
+    if(${dir} STREQUAL reactos/system32)\r
+        set(${var} 1)\r
+    elseif(${dir} STREQUAL reactos/system32/drivers)\r
+        set(${var} 2)\r
+    elseif(${dir} STREQUAL reactos/Fonts)\r
+        set(${var} 3)\r
+    elseif(${dir} STREQUAL reactos)\r
+        set(${var} 4)\r
+    elseif(${dir} STREQUAL reactos/system32/drivers/etc)\r
+        set(${var} 5)\r
+    elseif(${dir} STREQUAL reactos/inf)\r
+        set(${var} 6)\r
+    elseif(${dir} STREQUAL reactos/bin)\r
+        set(${var} 7)\r
+    elseif(${dir} STREQUAL reactos/media)\r
+        set(${var} 8)\r
+    else()\r
+        message(ERROR "Wrong destination: ${dir}")\r
+    endif()\r
+endmacro()\r
+\r
+function(add_cd_file)\r
+    cmake_parse_arguments(_CD "NO_CAB;NO_LIVECD" "DESTINATION;NAME_ON_CD;TARGET" "FILE" ${ARGN})\r
+    if(NOT (_CD_TARGET OR _CD_FILE))\r
+        message(FATAL_ERROR "You must provide a target or a file to install!")\r
+    endif()\r
+    \r
+    if(NOT _CD_DESTINATION)\r
+        message(FATAL_ERROR "You must provide a destination")\r
+    elseif(${_CD_DESTINATION} STREQUAL root)\r
+        set(_CD_DESTINATION "")\r
+    endif()\r
+    \r
+    if(NOT _CD_FILE)\r
+        get_target_property(__file ${_CD_TARGET} LOCATION)\r
+    else()\r
+        if(NOT _CD_NO_CAB)\r
+            add_dependencies(reactos_cab ${_CD_FILE})\r
+        endif()\r
+        set(__file ${_CD_FILE})\r
+    endif()\r
+    #whether or not we should put it in reactos.cab or directly on cd\r
+    if(_CD_NO_CAB)\r
+        foreach(item ${__file})\r
+            file(APPEND ${REACTOS_BINARY_DIR}/boot/bootcd.cmake "file(COPY \"${item}\" DESTINATION \"\${CD_DIR}/${_CD_DESTINATION}\")\n")\r
+        endforeach()\r
+        if(_CD_NAME_ON_CD)\r
+            get_filename_component(__file ${__file} NAME)\r
+            #rename it in the cd tree\r
+            file(APPEND ${REACTOS_BINARY_DIR}/boot/bootcd.cmake "file(RENAME \${CD_DIR}/${_CD_DESTINATION}/${__file} \${CD_DIR}/${_CD_DESTINATION}/${_CD_NAME_ON_CD})\n")\r
+        endif()\r
+        #add right dependency\r
+        if(_CD_TARGET)\r
+            add_dependencies(bootcd ${_CD_TARGET})\r
+        else()\r
+            add_dependencies(bootcd ${_CD_FILE})\r
+        endif()\r
+        if(NOT _CD_NO_LIVECD)\r
+            file(APPEND ${REACTOS_BINARY_DIR}/boot/livecd.cmake "file(COPY \"${__file}\" DESTINATION \"\${CD_DIR}/${_CD_DESTINATION}\")\n")\r
+        endif()\r
+    else()\r
+        #add right dependency\r
+        if(_CD_TARGET)\r
+            add_dependencies(reactos_cab ${_CD_TARGET})\r
+        else()\r
+            add_dependencies(reactos_cab ${_CD_FILE})\r
+        endif()\r
+        dir_to_num(${_CD_DESTINATION} _num)\r
+        file(APPEND ${REACTOS_BINARY_DIR}/boot/bootdata/packages/reactos.dff.dyn "${__file} ${_num}\n")\r
+    endif()\r
+endfunction()\r
index 6ec1bc5..b3ecc66 100644 (file)
@@ -12,4 +12,4 @@ add_pch(cacls ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
 
 set_module_type(cacls win32cui)
 add_importlibs(cacls advapi32 user32 shell32 msvcrt kernel32)
-add_cab_target(cacls 1)
+add_cd_file(TARGET cacls DESTINATION reactos/system32)
index cfa99b5..aabe370 100644 (file)
@@ -19,4 +19,4 @@ if(MSVC)
 add_importlibs(calc ntdll)
 endif()
 
-add_cab_target(calc 1)
+add_cd_file(TARGET calc DESTINATION reactos/system32)
index e2b5201..6f0cb6b 100644 (file)
@@ -19,4 +19,4 @@ set_module_type(charmap win32gui)
 
 add_importlibs(charmap user32 gdi32 comctl32 kernel32 msvcrt)
 
-add_cab_target(charmap 1)
+add_cd_file(TARGET charmap DESTINATION reactos/system32)
index 5a3ce00..d8d2683 100644 (file)
@@ -2,4 +2,4 @@
 add_executable(dbgprint dbgprint.c)
 set_module_type(dbgprint win32cui)
 add_importlibs(dbgprint msvcrt kernel32)
-add_cab_target(dbgprint 1)
+add_cd_file(TARGET dbgprint DESTINATION reactos/system32)
index 62f86c5..19ab4db 100644 (file)
@@ -6,4 +6,4 @@ add_executable(doskey doskey.c doskey.rc)
 
 set_module_type(doskey win32cui)
 add_importlibs(doskey user32 msvcrt kernel32)
-add_cab_target(doskey 1)
+add_cd_file(TARGET doskey DESTINATION reactos/system32)
index 30acb79..51487aa 100644 (file)
@@ -4,4 +4,4 @@ add_executable(find find.c find.rc)
 
 set_module_type(find win32cui)
 add_importlibs(find user32 msvcrt kernel32)
-add_cab_target(find 1)
+add_cd_file(TARGET find DESTINATION reactos/system32)
index 5c715b7..ca18d41 100644 (file)
@@ -4,4 +4,4 @@ add_executable(hostname hostname.c hostname.rc)
 
 set_module_type(hostname win32cui)
 add_importlibs(hostname msvcrt kernel32)
-add_cab_target(hostname 1)
+add_cd_file(TARGET hostname DESTINATION reactos/system32)
index 2495c35..4e67ae7 100644 (file)
@@ -5,4 +5,4 @@ add_executable(lodctr lodctr_main.c)
 
 set_module_type(lodctr win32cui)
 add_importlibs(lodctr loadperf msvcrt kernel32)
-add_cab_target(lodctr 1)
+add_cd_file(TARGET lodctr DESTINATION reactos/system32)
index 2b8deb1..a679de9 100644 (file)
@@ -3,4 +3,4 @@ add_executable(more more.c more.rc)
 
 set_module_type(more win32cui)
 add_importlibs(more user32 msvcrt kernel32)
-add_cab_target(more 1)
+add_cd_file(TARGET more DESTINATION reactos/system32)
index 4e7fddb..0b47b31 100644 (file)
@@ -8,4 +8,4 @@ add_executable(reg reg.c rsrc.rc)
 
 set_module_type(reg win32cui)
 add_importlibs(reg advapi32 user32 msvcrt kernel32)
-add_cab_target(reg 1)
+add_cd_file(TARGET reg DESTINATION reactos/system32)
index 7624c0c..2de722b 100644 (file)
@@ -7,4 +7,4 @@ target_link_libraries(xcopy wine)
 
 set_module_type(xcopy win32cui)
 add_importlibs(xcopy shell32 user32 msvcrt kernel32 ntdll)
-add_cab_target(xcopy 1)
+add_cd_file(TARGET xcopy DESTINATION reactos/system32)
index bb6d2e0..c5c1509 100644 (file)
@@ -6,4 +6,4 @@ add_executable(control control.c control.rc)
 
 set_module_type(control win32gui)
 add_importlibs(control advapi32 shell32 msvcrt kernel32)
-add_cab_target(control 1)
+add_cd_file(TARGET control DESTINATION reactos/system32)
index e5fcc0f..84128a5 100644 (file)
@@ -30,4 +30,4 @@ target_link_libraries(dxdiag dxguid)
 
 add_importlibs(dxdiag user32 advapi32 comctl32 dinput8 setupapi dsound ddraw version gdi32 winmm d3d9 msvcrt kernel32 ntdll)
 
-add_cab_target(dxdiag 1)
+add_cd_file(TARGET dxdiag DESTINATION reactos/system32)
index 1770afa..dde47ad 100644 (file)
@@ -7,4 +7,4 @@ target_link_libraries(extrac32 wine)
 
 set_module_type(extrac32 win32gui)
 add_importlibs(extrac32 shell32 setupapi shlwapi user32 msvcrt kernel32 ntdll)
-add_cab_target(extrac32 1)
+add_cd_file(TARGET extrac32 DESTINATION reactos/system32)
index af3cdbf..6f7ebf8 100644 (file)
@@ -7,4 +7,4 @@ add_executable(findstr
 
 set_module_type(findstr win32cui)
 add_importlibs(findstr user32 msvcrt kernel32)
-add_cab_target(findstr 1)
+add_cd_file(TARGET findstr DESTINATION reactos/system32)
index 8be0dea..13af048 100644 (file)
@@ -8,4 +8,4 @@ add_executable(fontview
 set_module_type(fontview win32gui)
 add_importlibs(fontview gdi32 shell32 user32 msvcrt kernel32)
 
-add_cab_target(fontview 1)
+add_cd_file(TARGET fontview DESTINATION reactos/system32)
index 938a32e..ce4aba2 100644 (file)
@@ -17,4 +17,4 @@ set_module_type(sol win32gui)
 
 add_importlibs(sol advapi32 comctl32 user32 gdi32 kernel32 msvcrt)
 
-add_cab_target(sol 1)
+add_cd_file(TARGET sol DESTINATION reactos/system32)
index acbd76f..45dd3d3 100644 (file)
@@ -17,4 +17,4 @@ set_module_type(spider win32gui)
 
 add_importlibs(spider advapi32 comctl32 user32 gdi32 kernel32 msvcrt)
 
-add_cab_target(spider 1)
+add_cd_file(TARGET spider DESTINATION reactos/system32)
index 63d7e6e..2a33820 100644 (file)
@@ -12,4 +12,4 @@ set_module_type(winmine win32gui)
 target_link_libraries(winmine wine)
 add_importlibs(winmine user32 gdi32 advapi32 shell32 msvcrt kernel32 ntdll)
 
-add_cab_target(winmine 1)
+add_cd_file(TARGET winmine DESTINATION reactos/system32)
index 3b78ce5..ea5dd21 100644 (file)
@@ -3,4 +3,4 @@ set_rc_compiler()
 add_executable(hh main.c hh.rc)
 set_module_type(hh win32gui)
 add_importlibs(hh gdi32 user32 msvcrt kernel32)
-add_cab_target(hh 4)
+add_cd_file(TARGET hh DESTINATION reactos)
index fd2c6f1..3d7445c 100644 (file)
@@ -3,4 +3,4 @@ set_rc_compiler()
 add_executable(iexplore main.c iexplore.rc)
 set_module_type(iexplore win32gui)
 add_importlibs(iexplore shdocvw msvcrt kernel32)
-add_cab_target(iexplore 4)
+add_cd_file(TARGET iexplore DESTINATION reactos)
index f48cd9c..bcd3913 100644 (file)
@@ -7,5 +7,5 @@ add_executable(kbswitch kbswitch.c kbswitch.rc)
 set_module_type(kbswitch win32gui)
 add_importlibs(kbswitch advapi32 user32 shell32 gdi32 msvcrt kernel32)
 
-add_cab_target(kbswitch 1)
+add_cd_file(TARGET kbswitch DESTINATION reactos/system32)
 add_subdirectory(kbsdll)
index 135969e..785e629 100644 (file)
@@ -12,4 +12,4 @@ add_library(kbsdll SHARED ${SOURCE})
 
 set_module_type(kbsdll win32dll)
 add_importlibs(kbsdll user32 comctl32 kernel32 msvcrt)
-add_cab_target(kbsdll 1)
+add_cd_file(TARGET kbsdll DESTINATION reactos/system32)
index c7cbb7f..30981a9 100644 (file)
@@ -12,4 +12,4 @@ add_pch(logoff ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
 
 set_module_type(logoff win32cui)
 add_importlibs(logoff advapi32 user32 msvcrt kernel32)
-add_cab_target(logoff 1)
+add_cd_file(TARGET logoff DESTINATION reactos/system32)
index b464189..8a6cc24 100644 (file)
@@ -8,4 +8,4 @@ add_executable(magnify
 
 set_module_type(magnify win32gui)
 add_importlibs(magnify user32 gdi32 advapi32 shell32 msvcrt kernel32)
-add_cab_target(magnify 1)
+add_cd_file(TARGET magnify DESTINATION reactos/system32)
index 549df47..dc6ff3d 100644 (file)
@@ -6,4 +6,4 @@ add_executable(mplay32 mplay32.c mplay32.rc)
 
 set_module_type(mplay32 win32gui)
 add_importlibs(mplay32 advapi32 comctl32 comdlg32 user32 gdi32 winmm shell32 msvcrt kernel32)
-add_cab_target(mplay32 1)
+add_cd_file(TARGET mplay32 DESTINATION reactos/system32)
index 5613489..43f3dce 100644 (file)
@@ -18,4 +18,4 @@ add_pch(msconfig ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
 
 set_module_type(msconfig win32gui)
 add_importlibs(msconfig user32 advapi32 version comctl32 shell32 shlwapi msvcrt kernel32)
-add_cab_target(msconfig 1)
+add_cd_file(TARGET msconfig DESTINATION reactos/system32)
index 26d97b2..ab96a03 100644 (file)
@@ -15,4 +15,4 @@ add_pch(devmgmt ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
 
 set_module_type(devmgmt win32gui)
 add_importlibs(devmgmt setupapi gdi32 user32 comctl32 advapi32 devmgr msvcrt kernel32)
-add_cab_target(devmgmt 1)
+add_cd_file(TARGET devmgmt DESTINATION reactos/system32)
index 0e138af..8d02579 100644 (file)
@@ -10,4 +10,4 @@ if(MSVC)
 add_importlibs(eventvwr ntdll)
 endif()
 
-add_cab_target(eventvwr 1)
+add_cd_file(TARGET eventvwr DESTINATION reactos/system32)
index 3cf667b..af36e51 100644 (file)
@@ -32,4 +32,4 @@ set_module_type(servman win32gui)
 
 add_importlibs(servman user32 gdi32 advapi32 version comctl32 shell32 comdlg32 msvcrt kernel32)
 
-add_cab_target(servman 1)
+add_cd_file(TARGET servman DESTINATION reactos/system32)
index c1bfeb5..69e7683 100644 (file)
@@ -18,4 +18,4 @@ add_executable(mspaint
 
 set_module_type(mspaint win32gui)
 add_importlibs(mspaint comdlg32 shell32 user32 gdi32 advapi32 comctl32 msvcrt kernel32)
-add_cab_target(mspaint 1)
+add_cd_file(TARGET mspaint DESTINATION reactos/system32)
index bba3bb3..b5f3254 100644 (file)
@@ -31,4 +31,4 @@ set_module_type(mstsc win32gui)
 
 add_importlibs(mstsc user32 gdi32 comctl32 ws2_32 advapi32 shell32 ole32 comdlg32 msvcrt kernel32)
 
-add_cab_target(mstsc 1)
+add_cd_file(TARGET mstsc DESTINATION reactos/system32)
index 7c0c091..44cfd7e 100644 (file)
@@ -5,4 +5,4 @@ set_module_type(arp win32cui)
 
 add_importlibs(arp iphlpapi ws2_32 shlwapi msvcrt kernel32)
 
-add_cab_target(arp 1)
+add_cd_file(TARGET arp DESTINATION reactos/system32)
index 195a968..a56eafa 100644 (file)
@@ -13,4 +13,4 @@ if(MSVC)
 add_importlibs(dwnl ntdll)
 endif()
 
-add_cab_target(dwnl 1)
+add_cd_file(TARGET dwnl DESTINATION reactos/system32)
index 9ac4d9e..90947fa 100644 (file)
@@ -12,4 +12,4 @@ add_executable(finger
 
 set_module_type(finger win32cui)
 add_importlibs(finger ws2_32 msvcrt kernel32)
-add_cab_target(finger 1)
+add_cd_file(TARGET finger DESTINATION reactos/system32)
index 0d74b9a..d9f2463 100644 (file)
@@ -21,4 +21,4 @@ if(MSVC)
     add_importlibs(ftp ntdll)
 endif()
 
-add_cab_target(ftp 1)
+add_cd_file(TARGET ftp DESTINATION reactos/system32)
index ec18cf5..214593b 100644 (file)
@@ -2,4 +2,4 @@
 add_executable(ipconfig ipconfig.c ipconfig.rc)
 set_module_type(ipconfig win32cui)
 add_importlibs(ipconfig user32 iphlpapi advapi32 msvcrt kernel32)
-add_cab_target(ipconfig 1)
+add_cd_file(TARGET ipconfig DESTINATION reactos/system32)
index aacb247..353ff9a 100644 (file)
@@ -12,4 +12,4 @@ add_executable(net ${SOURCE})
 
 set_module_type(net win32cui)
 add_importlibs(net ws2_32 msvcrt kernel32)
-add_cab_target(net 1)
+add_cd_file(TARGET net DESTINATION reactos/system32)
index ee63313..1860bca 100644 (file)
@@ -2,4 +2,4 @@
 add_executable(netstat netstat.c netstat.rc)
 set_module_type(netstat win32cui)
 add_importlibs(netstat user32 ws2_32 snmpapi iphlpapi msvcrt kernel32)
-add_cab_target(netstat 1)
+add_cd_file(TARGET netstat DESTINATION reactos/system32)
index 5d1c17f..85e99fe 100644 (file)
@@ -6,4 +6,4 @@ add_executable(nslookup
 
 set_module_type(nslookup win32cui)
 add_importlibs(nslookup user32 ws2_32 snmpapi iphlpapi msvcrt kernel32)
-add_cab_target(nslookup 1)
+add_cd_file(TARGET nslookup DESTINATION reactos/system32)
index c9ef4c2..442ac27 100644 (file)
@@ -13,4 +13,4 @@ if(MSVC)
 add_importlibs(ping ntdll)
 endif()
 
-add_cab_target(ping 1)
+add_cd_file(TARGET ping DESTINATION reactos/system32)
index dd04f73..fc0de74 100644 (file)
@@ -7,4 +7,4 @@ add_executable(route route.c route.rc)
 
 set_module_type(route win32cui)
 add_importlibs(route ws2_32 iphlpapi msvcrt kernel32)
-add_cab_target(route 1)
+add_cd_file(TARGET route DESTINATION reactos/system32)
index 2fe2764..67973df 100644 (file)
@@ -29,4 +29,4 @@ add_executable(telnet
 
 set_module_type(telnet win32cui)
 add_importlibs(telnet ws2_32 user32 kernel32 msvcrt)
-add_cab_target(telnet 1)
+add_cd_file(TARGET telnet DESTINATION reactos/system32)
index 9d6ad65..75377ab 100644 (file)
@@ -10,4 +10,4 @@ if(MSVC)
 add_importlibs(tracert ntdll)
 endif()
 
-add_cab_target(tracert 1)
+add_cd_file(TARGET tracert DESTINATION reactos/system32)
index 66dab04..e71dfa6 100644 (file)
@@ -5,4 +5,4 @@ add_executable(whois whois.c whois.rc)
 
 set_module_type(whois win32cui)
 add_importlibs(whois ws2_32 msvcrt kernel32)
-add_cab_target(whois 1)
+add_cd_file(TARGET whois DESTINATION reactos/system32)
index b0fbb92..9ed29ff 100644 (file)
@@ -14,4 +14,4 @@ add_executable(notepad ${CMAKE_CURRENT_BINARY_DIR}/notepad_notepad.h.gch ${SOURC
 
 set_module_type(notepad win32gui)
 add_importlibs(notepad user32 gdi32 comctl32 comdlg32 advapi32 shell32 msvcrt kernel32)
-add_cab_target(notepad 1)
+add_cd_file(TARGET notepad DESTINATION reactos/system32)
index f49f70d..facdf43 100644 (file)
@@ -32,4 +32,4 @@ target_link_libraries(rapps uuid)
 add_importlibs(rapps advapi32 comctl32 gdi32 urlmon user32 shell32 shlwapi kernel32 msvcrt ntdll)
 add_dependencies(rapps rappsmsg)
 add_message_headers(rappsmsg.mc)
-add_cab_target(rapps 1)
+add_cd_file(TARGET rapps DESTINATION reactos/system32)
index 411aaea..24819be 100644 (file)
@@ -34,4 +34,4 @@ add_importlibs(regedit user32 gdi32 advapi32 ole32 shell32 comctl32 comdlg32 shl
 
 #add_subdirectory(clb)
 
-add_cab_target(regedit 4)
+add_cd_file(TARGET regedit DESTINATION reactos)
index 9dabef7..b14849f 100644 (file)
@@ -6,4 +6,4 @@ add_executable(regedt32 regedt32.c resource.rc)
 
 set_module_type(regedt32 win32gui)
 add_importlibs(regedt32 shell32 shlwapi msvcrt kernel32)
-add_cab_target(regedt32 1)
+add_cd_file(TARGET regedt32 DESTINATION reactos/system32)
index 8de2337..0260183 100644 (file)
@@ -19,4 +19,4 @@ add_pch(sc ${CMAKE_CURRENT_SOURCE_DIR}/sc.h ${SOURCE})
 
 set_module_type(sc win32cui)
 add_importlibs(sc advapi32 msvcrt kernel32)
-add_cab_target(sc 1)
+add_cd_file(TARGET sc DESTINATION reactos/system32)
index 3f81614..38f89e3 100644 (file)
@@ -13,4 +13,4 @@ set_target_properties(3dtext PROPERTIES SUFFIX ".scr")
 target_link_libraries(3dtext scrnsave)
 add_importlibs(3dtext user32 gdi32 opengl32 glu32 advapi32 msvcrt kernel32)
 
-add_cab_target(3dtext 1)
+add_cd_file(TARGET 3dtext DESTINATION reactos/system32)
index f909e2a..74c4a2c 100644 (file)
@@ -9,4 +9,4 @@ set_target_properties(logon PROPERTIES SUFFIX ".scr")
 
 target_link_libraries(logon scrnsave)
 add_importlibs(logon user32 gdi32 msvcrt kernel32)
-add_cab_target(logon 1)
+add_cd_file(TARGET logon DESTINATION reactos/system32)
index f72303e..089879c 100644 (file)
@@ -12,4 +12,4 @@ add_pch(shutdown ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
 
 set_module_type(shutdown win32cui)
 add_importlibs(shutdown advapi32 user32 msvcrt kernel32)
-add_cab_target(shutdown 1)
+add_cd_file(TARGET shutdown DESTINATION reactos/system32)
index 464dd03..69471cc 100644 (file)
@@ -17,4 +17,4 @@ add_executable(sndrec32
 target_link_libraries(sndrec32 stlport)
 set_module_type(sndrec32 win32gui)
 add_importlibs(sndrec32 winmm user32 msacm32 comctl32 comdlg32 gdi32 msvcrt kernel32)
-add_cab_target(sndrec32 1)
+add_cd_file(TARGET sndrec32 DESTINATION reactos/system32)
index 09af758..d39b0ed 100644 (file)
@@ -16,4 +16,4 @@ add_pch(sndvol32 ${CMAKE_CURRENT_SOURCE_DIR}/sndvol32.h ${SOURCE})
 
 set_module_type(sndvol32 win32gui)
 add_importlibs(sndvol32 user32 advapi32 gdi32 comctl32 shell32 winmm msvcrt kernel32 ntdll)
-add_cab_target(sndvol32 1)
+add_cd_file(TARGET sndvol32 DESTINATION reactos/system32)
index 8a78ccc..36ded18 100644 (file)
@@ -29,4 +29,4 @@ add_pch(taskmgr ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
 
 set_module_type(taskmgr win32gui)
 add_importlibs(taskmgr advapi32 user32 gdi32 shell32 comctl32 msvcrt kernel32 ntdll)
-add_cab_target(taskmgr 1)
+add_cd_file(TARGET taskmgr DESTINATION reactos/system32)
index 071c768..faca385 100644 (file)
@@ -23,4 +23,4 @@ set_module_type(winhlp32 win32gui)
 
 target_link_libraries(winhlp32 wine)
 add_importlibs(winhlp32 user32 gdi32 shell32 comctl32 comdlg32 msvcrt kernel32 ntdll)
-add_cab_target(winhlp32 4)
+add_cd_file(TARGET winhlp32 DESTINATION reactos)
index 76bb3f2..a032c8c 100644 (file)
@@ -4,4 +4,4 @@ set_unicode()
 add_executable(winver winver.c)
 set_module_type(winver win32gui)
 add_importlibs(winver shell32 msvcrt kernel32)
-add_cab_target(winver 1)
+add_cd_file(TARGET winver DESTINATION reactos/system32)
index 6b13acb..a5817a3 100644 (file)
@@ -20,4 +20,4 @@ set_module_type(wordpad win32gui)
 
 target_link_libraries(wordpad wine uuid)
 add_importlibs(wordpad comdlg32 ole32 shell32 user32 gdi32 advapi32 comctl32 msvcrt kernel32 ntdll)
-add_cab_target(wordpad 1)
+add_cd_file(TARGET wordpad DESTINATION reactos/system32)
index a528a5e..865f0df 100644 (file)
@@ -4,4 +4,4 @@ set_unicode()
 add_executable(write write.c rsrc.rc)
 set_module_type(write win32gui)
 add_importlibs(write user32 gdi32 msvcrt kernel32)
-add_cab_target(write 1)
+add_cd_file(TARGET write DESTINATION reactos/system32)
index 55271c4..48b9db6 100644 (file)
@@ -12,4 +12,4 @@ add_executable(audiosrv
 
 set_module_type(audiosrv win32cui)
 add_importlibs(audiosrv advapi32 user32 setupapi msvcrt kernel32)
-add_cab_target(audiosrv 1)
+add_cd_file(TARGET audiosrv DESTINATION reactos/system32)
index a8f5b4a..5eb0a38 100644 (file)
@@ -19,4 +19,4 @@ add_pch(eventlog ${CMAKE_CURRENT_SOURCE_DIR}/eventlog.h ${SOURCE})
 
 set_module_type(eventlog win32cui)
 add_importlibs(eventlog advapi32 rpcrt4 msvcrt kernel32 ntdll)
-add_cab_target(eventlog 1)
+add_cd_file(TARGET eventlog DESTINATION reactos/system32)
index 3ea2156..64a99c8 100644 (file)
@@ -17,5 +17,5 @@ target_link_libraries(rpcss epmrpc irotrpc ${PSEH_LIB} wine)
 set_module_type(rpcss win32cui)
 
 add_importlibs(rpcss advapi32 rpcrt4 msvcrt kernel32 ntdll)
-add_cab_target(rpcss 1)
+add_cd_file(TARGET rpcss DESTINATION reactos/system32)
 add_dependencies(rpcss winesdk)
index 99feb71..ff9b91e 100644 (file)
@@ -7,4 +7,4 @@ target_link_libraries(spoolsv wine)
 
 set_module_type(spoolsv win32cui)
 add_importlibs(spoolsv advapi32 msvcrt kernel32 ntdll)
-add_cab_target(spoolsv 1)
+add_cd_file(TARGET spoolsv DESTINATION reactos/system32)
index f4188a2..8b18ac6 100644 (file)
@@ -3,4 +3,4 @@ add_executable(svchost svchost.c svchost.rc)
 
 set_module_type(svchost win32cui)
 add_importlibs(svchost advapi32 msvcrt kernel32 ntdll)
-add_cab_target(svchost 1)
+add_cd_file(TARGET svchost DESTINATION reactos/system32)
index b0810d1..3eb53de 100644 (file)
@@ -19,5 +19,5 @@ set_module_type(tcpsvcs win32cui)
 add_importlibs(tcpsvcs ws2_32 advapi32 msvcrt kernel32 ntdll)
 
 
-add_cab_target(tcpsvcs 1)
-add_cab(${CMAKE_CURRENT_SOURCE_DIR}/quotes 5)
\ No newline at end of file
+add_cd_file(TARGET tcpsvcs DESTINATION reactos/system32)
+add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/quotes DESTINATION reactos/system32/drivers/etc)
\ No newline at end of file
index d803319..71880bb 100644 (file)
@@ -10,4 +10,4 @@ target_link_libraries(telnetd wine)
 
 set_module_type(telnetd win32cui)
 add_importlibs(telnetd advapi32 ws2_32 msvcrt kernel32 ntdll)
-add_cab_target(telnetd 1)
+add_cd_file(TARGET telnetd DESTINATION reactos/system32)
index 03ccbec..5ed8fb3 100644 (file)
@@ -11,4 +11,4 @@ target_link_libraries(umpnpmgr pnprpc wdmguid ${PSEH_LIB})
 
 set_module_type(umpnpmgr win32cui)
 add_importlibs(umpnpmgr advapi32 rpcrt4 userenv msvcrt kernel32 ntdll)
-add_cab_target(umpnpmgr 1)
+add_cd_file(TARGET umpnpmgr DESTINATION reactos/system32)
index 284e925..9dbecd8 100644 (file)
@@ -8,4 +8,4 @@ target_link_libraries(wlansvc wlansvcrpc ${PSEH_LIB})
 
 set_module_type(wlansvc win32cui)
 add_importlibs(wlansvc advapi32 rpcrt4 iphlpapi msvcrt kernel32 ntdll)
-add_cab_target(wlansvc 1)
+add_cd_file(TARGET wlansvc DESTINATION reactos/system32)
index 3a0ceb6..4d65761 100644 (file)
@@ -8,4 +8,4 @@ target_link_libraries(reactos uuid)
 
 set_module_type(reactos win32gui)
 add_importlibs(reactos gdi32 user32 comctl32 setupapi msvcrt kernel32 ntdll)
-add_minicd_target(reactos reactos)
+add_cd_file(TARGET reactos DESTINATION reactos NO_CAB NO_LIVECD)
index 27a9f64..36c57a3 100644 (file)
@@ -5,4 +5,4 @@ add_executable(setup setup.c setup.rc)
 
 set_module_type(setup win32gui)
 add_importlibs(setup userenv msvcrt kernel32 ntdll)
-add_cab_target(setup 1)
+add_cd_file(TARGET setup DESTINATION reactos/system32)
index 269fd74..9a086c5 100644 (file)
@@ -44,4 +44,4 @@ endif()
 
 set_module_type(usetup nativecui)
 add_importlibs(usetup kernel32 ntdll)
-add_minicd_target(usetup reactos/system32 smss.exe)
+add_cd_file(TARGET usetup DESTINATION reactos/system32 NO_CAB NO_LIVECD NAME_ON_CD smss.exe)
index f0d8152..0051b0a 100644 (file)
@@ -126,7 +126,7 @@ SetupCopyFile(PWCHAR SourceFileName,
                      FILE_SEQUENTIAL_ONLY);
   if(!NT_SUCCESS(Status))
     {
-      DPRINT1("NtOpenFile failed: %x\n", Status);
+      DPRINT1("NtOpenFile failed: %x, %wZ\n", Status, &FileName);
       goto done;
     }
 #else
index 9fa6d32..e839735 100644 (file)
@@ -2843,6 +2843,7 @@ AddSectionToCopyQueue(HINF InfFile,
     PWCHAR FileKeyValue;
     PWCHAR DirKeyValue;
     PWCHAR TargetFileName;
+    WCHAR CompleteOrigFileName[512];
 
     if (SourceCabinet)
         return AddSectionToCopyQueueCab(InfFile, L"SourceFiles", SourceCabinet, DestinationPath, Ir);
@@ -2901,10 +2902,14 @@ AddSectionToCopyQueue(HINF InfFile,
             break;
         }
 
+        wcscpy(CompleteOrigFileName, SourceRootDir.Buffer);
+        wcscat(CompleteOrigFileName, L"\\");
+        wcscat(CompleteOrigFileName, DirKeyValue);
+
         if (!SetupQueueCopy(SetupFileQueue,
                             SourceCabinet,
                             SourceRootPath.Buffer,
-                            SourceRootDir.Buffer,
+                            CompleteOrigFileName,
                             FileKeyName,
                             DirKeyValue,
                             TargetFileName))
index 38ea15e..438f993 100644 (file)
@@ -18,4 +18,4 @@ add_importlibs(vmwinst
     kernel32
     ntdll)
 
-add_cab_target(vmwinst 1)
+add_cd_file(TARGET vmwinst DESTINATION reactos/system32)
index de50226..26b545b 100644 (file)
@@ -5,4 +5,4 @@ add_executable(welcome welcome.c welcome.rc)
 
 set_module_type(welcome win32gui)
 add_importlibs(welcome gdi32 user32 msvcrt kernel32 ntdll)
-add_minicd_target(welcome reactos)
+add_cd_file(TARGET welcome DESTINATION reactos NO_CAB NO_LIVECD)
index 97692ba..5b06690 100644 (file)
@@ -79,4 +79,4 @@ target_link_libraries(cmd wine)
 add_pch(cmd ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h SOURCE)
 set_module_type(cmd win32cui)
 add_importlibs(cmd advapi32 user32 msvcrt kernel32 ntdll)
-add_cab_target(cmd 1)
+add_cd_file(TARGET cmd DESTINATION reactos/system32)
index cd581cc..1ab9228 100644 (file)
@@ -38,4 +38,4 @@ add_importlibs(explorer_new
     kernel32
     ntdll)
 
-add_cab_target(explorer_new 4)
+add_cd_file(TARGET explorer_new DESTINATION reactos)
index 295e5b1..f5d9b99 100644 (file)
@@ -73,5 +73,5 @@ add_importlibs(explorer advapi32 gdi32 user32 ws2_32 msimg32 comctl32 ole32 olea
 set_image_base(explorer 0x00400000)
 
 add_dependencies(explorer psdk)
-add_cab_target(explorer 4)
-add_cab(${CMAKE_CURRENT_SOURCE_DIR}/explorer-cfg-template.xml 4)
+add_cd_file(TARGET explorer DESTINATION reactos)
+add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/explorer-cfg-template.xml DESTINATION reactos)
index 4c3bda2..f0921c9 100644 (file)
@@ -14,4 +14,4 @@ set_module_type(notifyhook win32dll)
 
 add_importlibs(notifyhook user32 msvcrt kernel32)
 add_importlib_target(notifyhook.spec)
-add_cab_target(notifyhook 1)
+add_cd_file(TARGET notifyhook DESTINATION reactos/system32)
index c184654..d1a9d60 100644 (file)
@@ -5,4 +5,4 @@ set_module_type(autochk nativecui)
 
 target_link_libraries(autochk mingw_common nt)
 add_importlibs(autochk kernel32 ntdll)
-add_cab_target(autochk 1)
+add_cd_file(TARGET autochk DESTINATION reactos/system32)
index 9d8b104..d20653c 100644 (file)
@@ -7,4 +7,4 @@ add_executable(bootok bootok.c bootok.rc)
 
 set_module_type(bootok win32cui)
 add_importlibs(bootok advapi32 msvcrt kernel32 ntdll)
-add_cab_target(bootok 1)
+add_cd_file(TARGET bootok DESTINATION reactos/system32)
index cb393eb..162421d 100644 (file)
@@ -7,4 +7,4 @@ add_executable(expand expand.c expand.rc)
 
 set_module_type(expand win32cui)
 add_importlibs(expand lz32 setupapi user32 msvcrt kernel32 ntdll)
-add_cab_target(expand 1)
+add_cd_file(TARGET expand DESTINATION reactos/system32)
index 6b4d280..e3e7674 100644 (file)
@@ -8,4 +8,4 @@ add_executable(format format.c format.rc)
 
 set_module_type(format win32cui)
 add_importlibs(format user32 fmifs msvcrt kernel32 ntdll)
-add_cab_target(format 1)
+add_cd_file(TARGET format DESTINATION reactos/system32)
index 516f416..62a77a0 100644 (file)
@@ -7,4 +7,4 @@ add_executable(lsass lsass.c lsass.rc)
 
 set_module_type(lsass win32gui)
 add_importlibs(lsass advapi32 lsasrv msvcrt kernel32 ntdll)
-add_cab_target(lsass 1)
+add_cd_file(TARGET lsass DESTINATION reactos/system32)
index c2b6a24..f61a3f7 100644 (file)
@@ -16,4 +16,4 @@ set_module_type(msiexec win32gui)
 
 target_link_libraries(msiexec uuid wine)
 add_importlibs(msiexec user32 advapi32 ole32 msi msvcrt kernel32 ntdll)
-add_cab_target(msiexec 1)
+add_cd_file(TARGET msiexec DESTINATION reactos/system32)
index e676c20..a70c8ae 100644 (file)
@@ -9,4 +9,4 @@ add_executable(regsvr32 regsvr32.c regsvr32.rc)
 
 set_module_type(regsvr32 win32gui)
 add_importlibs(regsvr32 user32 shell32 ole32 msvcrt kernel32 ntdll)
-add_cab_target(regsvr32 1)
+add_cd_file(TARGET regsvr32 DESTINATION reactos/system32)
index bb43fc1..3503cd6 100644 (file)
@@ -7,4 +7,4 @@ add_executable(rundll32 rundll32.c rundll32.rc)
 
 set_module_type(rundll32 win32gui)
 add_importlibs(rundll32 user32 msvcrt kernel32 ntdll)
-add_cab_target(rundll32 1)
+add_cd_file(TARGET rundll32 DESTINATION reactos/system32)
index 62f7595..8de7c04 100644 (file)
@@ -6,4 +6,4 @@ add_executable(runonce runonce.c runonce.rc)
 
 set_module_type(runonce win32gui)
 add_importlibs(runonce advapi32 user32 msvcrt kernel32 ntdll)
-add_cab_target(runonce 1)
+add_cd_file(TARGET runonce DESTINATION reactos/system32)
index ef34a52..c4a78ce 100644 (file)
@@ -24,4 +24,4 @@ add_pch(services ${CMAKE_CURRENT_SOURCE_DIR}/services.h ${SOURCE})
 
 set_module_type(services win32cui)
 add_importlibs(services user32 advapi32 rpcrt4 msvcrt kernel32 ntdll)
-add_cab_target(services 1)
+add_cd_file(TARGET services DESTINATION reactos/system32)
index 2d9bd19..0e6513d 100644 (file)
@@ -35,4 +35,4 @@ add_pch(smss ${CMAKE_CURRENT_SOURCE_DIR}/smss.h ${SOURCE})
 
 set_module_type(smss nativecui)
 add_importlibs(smss ntdll)
-add_cab_target(smss 1)
+add_cd_file(TARGET smss DESTINATION reactos/system32)
index 8910445..bb6dc95 100644 (file)
@@ -8,4 +8,4 @@ add_executable(subst subst.c subst.rc)
 
 set_module_type(subst win32cui)
 add_importlibs(subst msvcrt kernel32 user32 ntdll)
-add_cab_target(subst 1)
+add_cd_file(TARGET subst DESTINATION reactos/system32)
index 66bd8f9..8937b31 100644 (file)
@@ -9,4 +9,4 @@ target_link_libraries(userinit wine)
 
 set_module_type(userinit win32gui)
 add_importlibs(userinit user32 gdi32 advapi32 shell32 shlwapi msvcrt kernel32 ntdll)
-add_cab_target(userinit 1)
+add_cd_file(TARGET userinit DESTINATION reactos/system32)
index b411d0d..1fec396 100644 (file)
@@ -16,4 +16,4 @@ add_pch(winlogon ${CMAKE_CURRENT_SOURCE_DIR}/winlogon.h ${SOURCE})
 
 set_module_type(winlogon win32gui)
 add_importlibs(winlogon user32 advapi32 userenv secur32 msvcrt kernel32 ntdll)
-add_cab_target(winlogon 1)
+add_cd_file(TARGET winlogon DESTINATION reactos/system32)
index d19e3f1..6a2d7ad 100644 (file)
@@ -1,28 +1,14 @@
 
-add_subdirectory(freeldr)
-
-add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/bootdata/txtsetup.sif reactos txtsetup.sif)
-add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/bootdata/bootcd.ini "" freeldr.ini)
-add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/bootdata/hivecls_${ARCH}.inf reactos hivecls.inf)
-add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/bootdata/hivedef_${ARCH}.inf reactos hivedef.inf)
-add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/bootdata/hivesft_${ARCH}.inf reactos hivesft.inf)
-add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/bootdata/hivesys_${ARCH}.inf reactos hivesys.inf)
-add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/bootdata/autorun.inf "" autorun.inf)
-add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/bootdata/icon.ico "" icon.ico)
-add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/bootdata/readme.txt "" readme.txt)
-# Livecd files
-list(APPEND LIVECD_HIVES
-    ${CMAKE_CURRENT_SOURCE_DIR}/bootdata/livecd.inf
-    ${CMAKE_CURRENT_SOURCE_DIR}/bootdata/hiveinst_${ARCH}.inf)
-
-add_custom_command(
-    OUTPUT ${LIVECD_DIR}/reactos/system32/config/sam
-    COMMAND native-mkhive ${CMAKE_CURRENT_SOURCE_DIR}/bootdata ${LIVECD_DIR}/reactos/system32/config ${ARCH} ${LIVECD_HIVES}
-    DEPENDS native-mkhive)
+#clear it out
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/bootcd.cmake 
+    "file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bootcd)\n")
 
-add_custom_target(livecd_hives DEPENDS ${LIVECD_DIR}/reactos/system32/config/sam)
+add_custom_target(bootcd
+    ${CMAKE_COMMAND} -D CD_DIR=${CMAKE_CURRENT_BINARY_DIR}/bootcd
+                             -P ${CMAKE_CURRENT_BINARY_DIR}/bootcd.cmake
+    COMMAND native-cdmake -v -j -m -b ${CMAKE_CURRENT_BINARY_DIR}/freeldr/bootsect/isoboot.bin ${BOOTCD_DIR} REACTOS ${REACTOS_BINARY_DIR}/bootcd.iso
+    #DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/bootcd.cmake
+    VERBATIM)
 
-add_livecd(${REACTOS_SOURCE_DIR}/boot/bootdata/livecd.ini "" freeldr.ini)
-
-#regtest
-add_cab(${REACTOS_SOURCE_DIR}/boot/bootdata/bootcdregtest/regtest.cmd 7)
+add_subdirectory(freeldr)
+add_subdirectory(bootdata)
diff --git a/boot/bootdata/CMakeLists.txt b/boot/bootdata/CMakeLists.txt
new file mode 100644 (file)
index 0000000..22d731e
--- /dev/null
@@ -0,0 +1,23 @@
+
+add_subdirectory(packages)
+
+add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/txtsetup.sif DESTINATION reactos NO_CAB NO_LIVECD)
+add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/hivecls_${ARCH}.inf DESTINATION reactos NO_CAB NO_LIVECD NAME_ON_CD hivecls.inf)
+add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/hivedef_${ARCH}.inf DESTINATION reactos NO_CAB NO_LIVECD NAME_ON_CD hivedef.inf)
+add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/hivesft_${ARCH}.inf DESTINATION reactos NO_CAB NO_LIVECD NAME_ON_CD hivesft.inf)
+add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/hivesys_${ARCH}.inf DESTINATION reactos NO_CAB NAME_ON_CD hivesys.inf)
+
+# bootcd/livecd hives
+list(APPEND CD_HIVES
+    ${CMAKE_CURRENT_SOURCE_DIR}/livecd.inf
+    ${CMAKE_CURRENT_SOURCE_DIR}/hiveinst_${ARCH}.inf)
+
+add_custom_target(livecd_hives
+    native-mkhive ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${ARCH} ${CD_HIVES}
+    DEPENDS native-mkhive ${CD_HIVES})
+
+#regtest
+add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/bootcdregtest/regtest.cmd DESTINATION reactos/bin)
+
+#freeldr.ini
+add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/bootcd.ini DESTINATION root NO_CAB NAME_ON_CD freeldr.ini NO_LIVECD)
diff --git a/boot/bootdata/packages/CMakeLists.txt b/boot/bootdata/packages/CMakeLists.txt
new file mode 100644 (file)
index 0000000..07b2fd0
--- /dev/null
@@ -0,0 +1,45 @@
+#reactos.dff
+
+# reactos.dff is the concatenation of two files :
+#   - reactos.dff.in, which is a static one and can be altered to
+# add custom modules/files to reactos.cab
+#   - reactos.dff.dyn (dyn as dynamic) which is generated at configure time by our cmake scripts
+# If you want to slip-stream anything into the bootcd, then you want to alter reactos.dff.in
+
+# Idea taken from there : http://www.cmake.org/pipermail/cmake/2010-July/038028.html
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/concat.cmake "
+    file(READ \${SRC1} S1)
+    file(READ \${SRC2} S2)
+    file(WRITE \${DST} \"\${S1}\${S2}\")
+")
+
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff.dyn "")
+
+add_custom_command(
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff
+    COMMAND ${CMAKE_COMMAND} -D SRC1=${CMAKE_CURRENT_SOURCE_DIR}/reactos.dff.in
+                             -D SRC2=${CMAKE_CURRENT_BINARY_DIR}/reactos.dff.dyn
+                             -D DST=${CMAKE_CURRENT_BINARY_DIR}/reactos.dff
+                             -P ${CMAKE_CURRENT_BINARY_DIR}/concat.cmake
+    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/reactos.dff.in
+    DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff.dyn
+)
+
+# And now we build reactos.cab
+add_custom_command(
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf
+    COMMAND native-cabman -C ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff -L ${CMAKE_CURRENT_BINARY_DIR} -I -P ${REACTOS_SOURCE_DIR}
+    DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff
+)
+# add_custom_command(
+    # OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/reactos.cab
+    # COMMAND native-cabman -C ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff -RC ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf -L ${CMAKE_CURRENT_BINARY_DIR} -N -P ${REACTOS_SOURCE_DIR}
+    # DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf
+# )
+
+add_custom_target(reactos_cab 
+    native-cabman -C ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff -RC ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf -L ${CMAKE_CURRENT_BINARY_DIR} -N -P ${REACTOS_SOURCE_DIR}
+    DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf
+    VERBATIM)
+    
+add_cd_file(TARGET reactos_cab FILE ${CMAKE_CURRENT_BINARY_DIR}/reactos.cab ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf DESTINATION reactos NO_CAB NO_LIVECD)
index b5789d1..cb44b08 100644 (file)
@@ -1,3 +1,4 @@
+
 ; Main ReactOS package
 
 .Set DiskLabelTemplate="ReactOS"                ; Label of disk
index fb0937e..183ee5b 100644 (file)
@@ -39,7 +39,13 @@ pci.sys=,,,,,,,,,,,,4
 scsiport.sys=,,,,,,x,,,,,,4
 fastfat.sys=,,,,,,x,,,,,,4
 ramdisk.sys=,,,,,,x,,,,,,4
-ext2.sys=,,,,,,x,,,,,,4
+ext2fs.sys=,,,,,,x,,,,,,4
+vgafonts.cab=,,,,,,,,,,,,1
+classpnp.sys=,,,,,,,,,,,,4
+pcix.sys=,,,,,,,,,,,,4
+pcmcia.sys=,,,,,,,,,,,,4
+swenum.sys=,,,,,,,,,,,,4
+ntdll.dll=,,,,,,,,,,,,2
 
 [HardwareIdsDatabase]
 ;*PNP0A00 = isapnp
index 2ef8f3a..5ce8b56 100644 (file)
@@ -4,4 +4,11 @@ CreateBootSectorTarget(ext2 ${CMAKE_CURRENT_SOURCE_DIR}/ext2.asm ${CMAKE_CURRENT
 CreateBootSectorTarget(fat32 ${CMAKE_CURRENT_SOURCE_DIR}/fat32.asm ${CMAKE_CURRENT_BINARY_DIR}/fat32.bin)
 CreateBootSectorTarget(fat ${CMAKE_CURRENT_SOURCE_DIR}/fat.asm ${CMAKE_CURRENT_BINARY_DIR}/fat.bin)
 CreateBootSectorTarget(isoboot ${CMAKE_CURRENT_SOURCE_DIR}/isoboot.asm ${CMAKE_CURRENT_BINARY_DIR}/isoboot.bin)
-CreateBootSectorTarget(isobtrt ${CMAKE_CURRENT_SOURCE_DIR}/isobtrt.asm ${CMAKE_CURRENT_BINARY_DIR}/isobtrt.bin)
\ No newline at end of file
+CreateBootSectorTarget(isobtrt ${CMAKE_CURRENT_SOURCE_DIR}/isobtrt.asm ${CMAKE_CURRENT_BINARY_DIR}/isobtrt.bin)
+
+add_cd_file(TARGET dosmbr DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/dosmbr.bin)
+add_cd_file(TARGET ext2 DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/ext2.bin)
+add_cd_file(TARGET fat32 DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/fat32.bin)
+add_cd_file(TARGET fat DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/fat.bin)
+add_cd_file(TARGET isoboot DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/isoboot.bin)
+add_cd_file(TARGET isobtrt DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/isobtrt.bin)
\ No newline at end of file
index 05e8a63..5fd8e4e 100644 (file)
@@ -192,6 +192,8 @@ target_link_libraries(freeldr
 add_pch(freeldr ${CMAKE_CURRENT_SOURCE_DIR}/include/freeldr.h ${FREELDR_SOURCE})
 add_dependencies(freeldr asm)
 
+add_cd_file(TARGET freeldr DESTINATION loader NO_CAB)
+
 list(APPEND SETUPLDR_MAIN_SOURCE
     bootmgr.c
     inffile/inffile.c
@@ -237,7 +239,5 @@ target_link_libraries(setupldr
 
 add_dependencies(setupldr asm)
 
-# Bootcd files
-add_minicd_target(setupldr loader setupldr.sys)
-add_minicd_target(freeldr loader freeldr.sys)
-add_livecd_target(setupldr loader)
+add_cd_file(TARGET setupldr DESTINATION loader NO_CAB)
+
index fd73775..58ee4d8 100644 (file)
@@ -109,11 +109,11 @@ SetupLdrLoadNlsData(PLOADER_PARAMETER_BLOCK LoaderBlock, HINF InfHandle, LPCSTR
 VOID
 SetupLdrScanBootDrivers(PLOADER_PARAMETER_BLOCK LoaderBlock, HINF InfHandle, LPCSTR SearchPath)
 {
-    INFCONTEXT InfContext;
+    INFCONTEXT InfContext, dirContext;
     BOOLEAN Status;
-    LPCSTR Media, DriverName;
+    LPCSTR Media, DriverName, dirIndex, ImagePath;
     WCHAR ServiceName[256];
-    WCHAR ImagePath[256];
+    WCHAR ImagePathW[256];
 
     /* Open inf section */
     if (!InfFindFirstLine(InfHandle, "SourceDisksFiles", NULL, &InfContext))
@@ -123,23 +123,28 @@ SetupLdrScanBootDrivers(PLOADER_PARAMETER_BLOCK LoaderBlock, HINF InfHandle, LPC
     do
     {
         if (InfGetDataField(&InfContext, 7, &Media) &&
-            InfGetDataField(&InfContext, 0, &DriverName))
+            InfGetDataField(&InfContext, 0, &DriverName) && 
+            InfGetDataField(&InfContext, 13, &dirIndex))
         {
-            if (strcmp(Media, "x") == 0)
+            if ((strcmp(Media, "x") == 0) &&
+                InfFindFirstLine(InfHandle, "Directories", dirIndex, &dirContext) &&
+                InfGetDataField(&dirContext, 1, &ImagePath))
             {
                 /* Convert name to widechar */
                 swprintf(ServiceName, L"%S", DriverName);
 
+                /* Prepare image path */
+                swprintf(ImagePathW, L"%S", ImagePath);
+                wcscat(ImagePathW, L"\\");
+                wcscat(ImagePathW, ServiceName);
+                
                 /* Remove .sys extension */
                 ServiceName[wcslen(ServiceName) - 4] = 0;
 
-                /* Prepare image path */
-                swprintf(ImagePath, L"%S", DriverName);
-
                 /* Add it to the list */
                 Status = WinLdrAddDriverToList(&LoaderBlock->BootDriverListHead,
                     L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\",
-                    ImagePath,
+                    ImagePathW,
                     ServiceName);
 
                 if (!Status)
@@ -278,37 +283,46 @@ VOID LoadReactOSSetup2(VOID)
 
     /* Load kernel */
     strcpy(FileName+strlen("\\ArcName\\"), BootPath);
-    strcat(FileName, "NTOSKRNL.EXE");
+    strcat(FileName, "SYSTEM32\\NTOSKRNL.EXE");
     Status = WinLdrLoadImage(FileName+strlen("\\ArcName\\"), LoaderSystemCode, &NtosBase);
     DPRINTM(DPRINT_WINDOWS, "Ntos loaded with status %d at %p\n", Status, NtosBase);
-    WinLdrAllocateDataTableEntry(LoaderBlock, "ntoskrnl.exe",
+    Status = WinLdrAllocateDataTableEntry(LoaderBlock, "ntoskrnl.exe",
         FileName, NtosBase, &KernelDTE);
+    DPRINTM(DPRINT_WINDOWS, "Ntos Data Table Entry allocated with status %d at %p\n", Status, KernelDTE);
 
     /* Load HAL */
     strcpy(FileName+strlen("\\ArcName\\"), BootPath);
-    strcat(FileName, "HAL.DLL");
+    strcat(FileName, "SYSTEM32\\HAL.DLL");
     Status = WinLdrLoadImage(FileName+strlen("\\ArcName\\"), LoaderHalCode, &HalBase);
     DPRINTM(DPRINT_WINDOWS, "HAL loaded with status %d at %p\n", Status, HalBase);
-    WinLdrAllocateDataTableEntry(LoaderBlock, "hal.dll",
+    Status = WinLdrAllocateDataTableEntry(LoaderBlock, "hal.dll",
         FileName, HalBase, &HalDTE);
+    DPRINTM(DPRINT_WINDOWS, "HAL Data Table Entry allocated with status %d at %p\n", Status, HalDTE);
 
     /* Load kernel-debugger support dll */
     strcpy(FileName+strlen("\\ArcName\\"), BootPath);
-    strcat(FileName, "KDCOM.DLL");
+    strcat(FileName, "SYSTEM32\\KDCOM.DLL");
     Status = WinLdrLoadImage(FileName+strlen("\\ArcName\\"), LoaderBootDriver, &KdComBase);
     DPRINTM(DPRINT_WINDOWS, "KdCom loaded with status %d at %p\n", Status, KdComBase);
-    WinLdrAllocateDataTableEntry(LoaderBlock, "kdcom.dll",
+    Status = WinLdrAllocateDataTableEntry(LoaderBlock, "kdcom.dll",
         FileName, KdComBase, &KdComDTE);
+    DPRINTM(DPRINT_WINDOWS, "KdCom Data Table Entry allocated with status %d at %p\n", Status, HalDTE);
 
     /* Load all referenced DLLs for kernel, HAL and kdcom.dll */
     strcpy(SearchPath, BootPath);
     WinLdrScanImportDescriptorTable(LoaderBlock, SearchPath, KernelDTE);
     WinLdrScanImportDescriptorTable(LoaderBlock, SearchPath, HalDTE);
+    if (KdComDTE)
+        WinLdrScanImportDescriptorTable(LoaderBlock, SearchPath, KdComDTE);
+    /* In system32 too */
+    strcpy(SearchPath + strlen(BootPath), "system32\\");
+    WinLdrScanImportDescriptorTable(LoaderBlock, SearchPath, KernelDTE);
+    WinLdrScanImportDescriptorTable(LoaderBlock, SearchPath, HalDTE);
     if (KdComDTE)
         WinLdrScanImportDescriptorTable(LoaderBlock, SearchPath, KdComDTE);
 
-    /* Load NLS data */
-    SetupLdrLoadNlsData(LoaderBlock, InfHandle, BootPath);
+    /* Load NLS data, they are in system32 */
+    SetupLdrLoadNlsData(LoaderBlock, InfHandle, SearchPath);
 
     /* Get a list of boot drivers */
     SetupLdrScanBootDrivers(LoaderBlock, InfHandle, BootPath);
index 57497e8..c262e1e 100644 (file)
@@ -16,4 +16,4 @@ add_importlibs(dxtn msvcrt)
 
 add_dependencies(dxtn psdk)
 
-add_cab_target(dxtn 1)
+add_cd_file(TARGET dxtn DESTINATION reactos/system32)
index 9c074e8..646af89 100644 (file)
@@ -70,4 +70,4 @@ add_importlibs(libjpeg msvcrt kernel32)
 
 add_dependencies(libjpeg psdk)
 
-add_cab_target(libjpeg 1)
+add_cd_file(TARGET libjpeg DESTINATION reactos/system32)
index 3a17e90..4bd4087 100644 (file)
@@ -36,4 +36,4 @@ add_importlibs(libpng msvcrt kernel32)
 
 add_dependencies(libpng psdk)
 
-add_cab_target(libpng 1)
+add_cd_file(TARGET libpng DESTINATION reactos/system32)
index 0d4da92..86f79be 100644 (file)
@@ -59,4 +59,4 @@ add_importlibs(libtiff user32 msvcrt kernel32)
 
 add_dependencies(libtiff psdk)
 
-add_cab_target(libtiff 1)
+add_cd_file(TARGET libtiff DESTINATION reactos/system32)
index 85a0f8f..9fb554c 100644 (file)
@@ -43,4 +43,4 @@ endif()
 
 add_dependencies(libxslt psdk)
 
-add_cab_target(libxslt 1)
+add_cd_file(TARGET libxslt DESTINATION reactos/system32)
index cd76f19..7cc558f 100644 (file)
@@ -269,4 +269,4 @@ add_importlibs(mesa32 gdi32 user32 msvcrt kernel32 ntdll)
 
 add_dependencies(mesa32 psdk)
 
-add_cab_target(mesa32 1)
+add_cd_file(TARGET mesa32 DESTINATION reactos/system32)
index b76afa3..425b8d3 100644 (file)
@@ -24,4 +24,4 @@ add_importlibs(access
     comctl32
     kernel32)
 
-add_cab_target(access 1)
+add_cd_file(TARGET access DESTINATION reactos/system32)
index f7423cf..9604735 100644 (file)
@@ -23,4 +23,4 @@ add_importlibs(appwiz
     shell32
     kernel32)
 
-add_cab_target(appwiz 1)
+add_cd_file(TARGET appwiz DESTINATION reactos/system32)
index e498349..88e1768 100644 (file)
@@ -24,4 +24,4 @@ add_importlibs(console
     kernel32)
 
 add_pch(console ${CMAKE_CURRENT_SOURCE_DIR}/console.h ${SOURCE})
-add_cab_target(console 1)
+add_cd_file(TARGET console DESTINATION reactos/system32)
index a9ae5cb..d10c077 100644 (file)
@@ -47,4 +47,4 @@ add_importlibs(desk
     kernel32
     ntdll)
 
-add_cab_target(desk 1)
+add_cd_file(TARGET desk DESTINATION reactos/system32)
index 8082d0c..8877b18 100644 (file)
@@ -20,4 +20,4 @@ add_importlibs(hdwwiz
     kernel32
     ntdll)
 
-add_cab_target(hdwwiz 1)
+add_cd_file(TARGET hdwwiz DESTINATION reactos/system32)
index de8c3f0..a97a167 100644 (file)
@@ -23,4 +23,4 @@ add_importlibs(input
     gdi32
     kernel32)
 
-add_cab_target(input 1)
+add_cd_file(TARGET input DESTINATION reactos/system32)
index 6aaa0d3..d1c16e4 100644 (file)
@@ -32,4 +32,4 @@ add_importlibs(intl
     shell32
     kernel32)
 
-add_cab_target(intl 1)
+add_cd_file(TARGET intl DESTINATION reactos/system32)
index c08cc5b..9a674b2 100644 (file)
@@ -19,4 +19,4 @@ add_importlibs(joy
     kernel32
     ntdll)
 
-add_cab_target(joy 1)
+add_cd_file(TARGET joy DESTINATION reactos/system32)
index 38eb38e..64c629c 100644 (file)
@@ -26,4 +26,4 @@ add_importlibs(main
     gdi32
     kernel32)
 
-add_cab_target(main 1)
+add_cd_file(TARGET main DESTINATION reactos/system32)
index 6384bb3..9a547c7 100644 (file)
@@ -31,4 +31,4 @@ add_importlibs(mmsys
     ntdll
     kernel32)
 
-add_cab_target(mmsys 1)
+add_cd_file(TARGET mmsys DESTINATION reactos/system32)
index 66cc15d..4fc0548 100644 (file)
@@ -13,4 +13,4 @@ add_importlibs(ncpa
     shell32
     kernel32)
 
-add_cab_target(ncpa 1)
+add_cd_file(TARGET ncpa DESTINATION reactos/system32)
index e5f6fc0..66f0273 100644 (file)
@@ -8,4 +8,4 @@ add_library(odbccp32i SHARED odbccp32.c odbccp32.rc ${CMAKE_CURRENT_BINARY_DIR}/
 set_module_type(odbccp32i cpl)
 
 add_importlibs(odbccp32i user32 comctl32 msvcrt kernel32)
-add_cab_target(odbccp32i 1)
+add_cd_file(TARGET odbccp32i DESTINATION reactos/system32)
index f6ac3d0..c3ceee9 100644 (file)
@@ -25,4 +25,4 @@ add_importlibs(powercfg
     kernel32
     ntdll)
 
-add_cab_target(powercfg 1)
+add_cd_file(TARGET powercfg DESTINATION reactos/system32)
index 038c94f..1874de1 100644 (file)
@@ -38,4 +38,4 @@ add_importlibs(sysdm
     ntdll)
 
 add_pch(sysdm ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
-add_cab_target(sysdm 1)
+add_cd_file(TARGET sysdm DESTINATION reactos/system32)
index f321a56..20dcbbf 100644 (file)
@@ -19,4 +19,4 @@ add_importlibs(telephon
     msvcrt
     kernel32)
 
-add_cab_target(telephon 1)
+add_cd_file(TARGET telephon DESTINATION reactos/system32)
index 48eb91e..835091f 100644 (file)
@@ -27,4 +27,4 @@ add_importlibs(timedate
     msvcrt
     kernel32)
 
-add_cab_target(timedate 1)
+add_cd_file(TARGET timedate DESTINATION reactos/system32)
index e1728b5..f10fb3c 100644 (file)
@@ -31,4 +31,4 @@ add_importlibs(usrmgr
     ntdll)
 
 
-add_cab_target(usrmgr 1)
+add_cd_file(TARGET usrmgr DESTINATION reactos/system32)
index cfaaa1e..58acb8f 100644 (file)
@@ -33,4 +33,4 @@ add_importlibs(amstream
     ntdll)
 
 add_dependencies(amstream dxsdk)
-add_cab_target(amstream 1)
+add_cd_file(TARGET amstream DESTINATION reactos/system32)
index 3a9544b..a087e08 100644 (file)
@@ -9,4 +9,4 @@ add_importlibs(d3d8thk gdi32)
 
 add_dependencies(d3d8thk psdk)
 
-add_cab_target(d3d8thk 1)
+add_cd_file(TARGET d3d8thk DESTINATION reactos/system32)
index 2fe436d..bdd1cf3 100644 (file)
@@ -35,4 +35,4 @@ add_importlibs(devenum
     kernel32
     ntdll)
 
-add_cab_target(devenum 1)
+add_cd_file(TARGET devenum DESTINATION reactos/system32)
index f61ec37..fab0a4d 100644 (file)
@@ -37,5 +37,5 @@ add_importlibs(dinput
     kernel32
     ntdll)
 
-add_cab_target(dinput 1)
+add_cd_file(TARGET dinput DESTINATION reactos/system32)
 add_importlib_target(dinput.spec)
index ca384db..1dc499b 100644 (file)
@@ -32,5 +32,5 @@ add_importlibs(dinput8
 
 add_dependencies(dinput8 psdk)
 
-add_cab_target(dinput8 1)
+add_cd_file(TARGET dinput8 DESTINATION reactos/system32)
 add_importlib_target(dinput8.spec)
index 5eed21c..4fb1fe7 100644 (file)
@@ -41,4 +41,4 @@ add_importlibs(dmusic
 
 add_dependencies(dmusic psdk)
 
-add_cab_target(dmusic 1)
+add_cd_file(TARGET dmusic DESTINATION reactos/system32)
index 57b3017..ca8c48d 100644 (file)
@@ -27,5 +27,5 @@ add_importlibs(dplay
 
 add_dependencies(dplay psdk)
 
-add_cab_target(dplay 1)
+add_cd_file(TARGET dplay DESTINATION reactos/system32)
 add_importlib_target(dplay.spec libdplayx)
index 9ee83d4..12877e9 100644 (file)
@@ -36,5 +36,5 @@ add_importlibs(dplayx
     kernel32
     ntdll)
 
-add_cab_target(dplayx 1)
+add_cd_file(TARGET dplayx DESTINATION reactos/system32)
 add_importlib_target(dplayx.spec)
index 203b037..4de49af 100644 (file)
@@ -39,5 +39,5 @@ add_importlibs(dsound
     kernel32
     ntdll)
 
-add_cab_target(dsound 1)
+add_cd_file(TARGET dsound DESTINATION reactos/system32)
 add_importlib_target(dsound.spec)
index 1ff42b5..be676f5 100644 (file)
@@ -25,4 +25,4 @@ add_importlibs(dxdiagn
     kernel32
     ntdll)
 
-add_cab_target(dxdiagn 1)
+add_cd_file(TARGET dxdiagn DESTINATION reactos/system32)
index 49db65e..d86cb7c 100644 (file)
@@ -52,4 +52,4 @@ add_importlibs(ksproxy
 
 add_dependencies(ksproxy psdk)
 
-add_cab_target(ksproxy 1)
+add_cd_file(TARGET ksproxy DESTINATION reactos/system32)
index b892fac..8cb90ab 100644 (file)
@@ -7,5 +7,5 @@ set_module_type(ksuser win32dll)
 
 add_importlibs(ksuser advapi32 msvcrt kernel32 ntdll)
 add_dependencies(ksuser psdk bugcodes)
-add_cab_target(ksuser 1)
+add_cd_file(TARGET ksuser DESTINATION reactos/system32)
 add_importlib_target(ksuser.spec)
index 7041369..375c320 100644 (file)
@@ -26,4 +26,4 @@ add_importlibs(msdmo
 
 add_dependencies(msdmo dxsdk psdk)
 
-add_cab_target(msdmo 1)
+add_cd_file(TARGET msdmo DESTINATION reactos/system32)
index ae717b5..4da2d3c 100644 (file)
@@ -35,4 +35,4 @@ add_importlibs(qedit
     ntdll)
 
 add_dependencies(qedit dxsdk)
-add_cab_target(qedit 1)
+add_cd_file(TARGET qedit DESTINATION reactos/system32)
index 66c8e35..1e498af 100644 (file)
@@ -71,4 +71,4 @@ add_importlibs(quartz
     kernel32
     ntdll)
 
-add_cab_target(quartz 1)
+add_cd_file(TARGET quartz DESTINATION reactos/system32)
index 9d061e4..d35383a 100644 (file)
@@ -48,4 +48,4 @@ add_importlibs(d3d8
     ntdll)
 
 add_dependencies(d3d8 wineheaders)
-add_cab_target(d3d8 1)
+add_cd_file(TARGET d3d8 DESTINATION reactos/system32)
index 789b441..d0e0c98 100644 (file)
@@ -51,5 +51,5 @@ add_importlibs(d3d9
     ntdll)
 
 add_dependencies(d3d9 wineheaders)
-add_cab_target(d3d9 1)
+add_cd_file(TARGET d3d9 DESTINATION reactos/system32)
 add_importlib_target(d3d9.spec)
index 9b66de1..394802b 100644 (file)
@@ -30,5 +30,5 @@ add_importlibs(d3dx9_24
     ntdll)
 
 add_dependencies(d3dx9_24 wineheaders)
-add_cab_target(d3dx9_24 1)
+add_cd_file(TARGET d3dx9_24 DESTINATION reactos/system32)
 add_importlib_target(d3dx9_24.spec libd3dx9_36)
index b8daec5..4d03d78 100644 (file)
@@ -31,5 +31,5 @@ add_importlibs(d3dx9_25
     ntdll)
 
 add_dependencies(d3dx9_25 wineheaders)
-add_cab_target(d3dx9_25 1)
+add_cd_file(TARGET d3dx9_25 DESTINATION reactos/system32)
 add_importlib_target(d3dx9_25.spec libd3dx9_24 libd3dx9_36)
index 91c607e..316508e 100644 (file)
@@ -31,4 +31,4 @@ add_importlibs(d3dx9_26
     ntdll)
 
 add_dependencies(d3dx9_26 wineheaders)
-add_cab_target(d3dx9_26 1)
+add_cd_file(TARGET d3dx9_26 DESTINATION reactos/system32)
index b5cdeb7..cca8141 100644 (file)
@@ -31,4 +31,4 @@ add_importlibs(d3dx9_27
     ntdll)
 
 add_dependencies(d3dx9_27 wineheaders)
-add_cab_target(d3dx9_27 1)
+add_cd_file(TARGET d3dx9_27 DESTINATION reactos/system32)
index ec679aa..4109d4d 100644 (file)
@@ -31,4 +31,4 @@ add_importlibs(d3dx9_28
     ntdll)
 
 add_dependencies(d3dx9_28 wineheaders)
-add_cab_target(d3dx9_28 1)
+add_cd_file(TARGET d3dx9_28 DESTINATION reactos/system32)
index c51f0b0..d867c59 100644 (file)
@@ -31,4 +31,4 @@ add_importlibs(d3dx9_29
     ntdll)
 
 add_dependencies(d3dx9_29 wineheaders)
-add_cab_target(d3dx9_29 1)
+add_cd_file(TARGET d3dx9_29 DESTINATION reactos/system32)
index d1c271f..970e446 100644 (file)
@@ -31,4 +31,4 @@ add_importlibs(d3dx9_30
     ntdll)
 
 add_dependencies(d3dx9_30 wineheaders)
-add_cab_target(d3dx9_30 1)
+add_cd_file(TARGET d3dx9_30 DESTINATION reactos/system32)
index 05480aa..12804e1 100644 (file)
@@ -30,4 +30,4 @@ add_importlibs(d3dx9_31
     ntdll)
 
 add_dependencies(d3dx9_31 wineheaders)
-add_cab_target(d3dx9_31 1)
+add_cd_file(TARGET d3dx9_31 DESTINATION reactos/system32)
index a20daaa..2d080eb 100644 (file)
@@ -30,4 +30,4 @@ add_importlibs(d3dx9_32
     ntdll)
 
 add_dependencies(d3dx9_32 wineheaders)
-add_cab_target(d3dx9_32 1)
+add_cd_file(TARGET d3dx9_32 DESTINATION reactos/system32)
index 8475def..811284e 100644 (file)
@@ -30,4 +30,4 @@ add_importlibs(d3dx9_33
     ntdll)
 
 add_dependencies(d3dx9_33 wineheaders)
-add_cab_target(d3dx9_33 1)
+add_cd_file(TARGET d3dx9_33 DESTINATION reactos/system32)
index 54a7a70..c9d51ac 100644 (file)
@@ -30,4 +30,4 @@ add_importlibs(d3dx9_34
     ntdll)
 
 add_dependencies(d3dx9_34 wineheaders)
-add_cab_target(d3dx9_34 1)
+add_cd_file(TARGET d3dx9_34 DESTINATION reactos/system32)
index cb283e7..4e9792c 100644 (file)
@@ -29,4 +29,4 @@ add_importlibs(d3dx9_35
     ntdll)
 
 add_dependencies(d3dx9_35 wineheaders)
-add_cab_target(d3dx9_35 1)
+add_cd_file(TARGET d3dx9_35 DESTINATION reactos/system32)
index 0ed8977..69cd341 100644 (file)
@@ -38,5 +38,5 @@ add_importlibs(d3dx9_36
     ntdll)
 
 add_dependencies(d3dx9_36 wineheaders)
-add_cab_target(d3dx9_36 1)
+add_cd_file(TARGET d3dx9_36 DESTINATION reactos/system32)
 add_importlib_target(d3dx9_36.spec)
index 86b0013..8475ea4 100644 (file)
@@ -29,4 +29,4 @@ add_importlibs(d3dx9_37
     ntdll)
 
 add_dependencies(d3dx9_37 wineheaders)
-add_cab_target(d3dx9_37 1)
+add_cd_file(TARGET d3dx9_37 DESTINATION reactos/system32)
index 0358e8d..e544f8b 100644 (file)
@@ -29,4 +29,4 @@ add_importlibs(d3dx9_38
     ntdll)
 
 add_dependencies(d3dx9_38 wineheaders)
-add_cab_target(d3dx9_38 1)
+add_cd_file(TARGET d3dx9_38 DESTINATION reactos/system32)
index 0f3df34..65090ab 100644 (file)
@@ -29,4 +29,4 @@ add_importlibs(d3dx9_39
     ntdll)
 
 add_dependencies(d3dx9_39 wineheaders)
-add_cab_target(d3dx9_39 1)
+add_cd_file(TARGET d3dx9_39 DESTINATION reactos/system32)
index 1522eb3..91513f1 100644 (file)
@@ -29,4 +29,4 @@ add_importlibs(d3dx9_40
     ntdll)
 
 add_dependencies(d3dx9_40 wineheaders)
-add_cab_target(d3dx9_40 1)
+add_cd_file(TARGET d3dx9_40 DESTINATION reactos/system32)
index 5e0c94f..599199a 100644 (file)
@@ -29,4 +29,4 @@ add_importlibs(d3dx9_41
     ntdll)
 
 add_dependencies(d3dx9_41 wineheaders)
-add_cab_target(d3dx9_41 1)
+add_cd_file(TARGET d3dx9_41 DESTINATION reactos/system32)
index 1d7bda2..ace4542 100644 (file)
@@ -29,4 +29,4 @@ add_importlibs(d3dx9_42
     ntdll)
 
 add_dependencies(d3dx9_42 wineheaders)
-add_cab_target(d3dx9_42 1)
+add_cd_file(TARGET d3dx9_42 DESTINATION reactos/system32)
index 361e85c..c248b5d 100644 (file)
@@ -54,5 +54,5 @@ add_importlibs(ddraw
     ntdll)
 
 add_dependencies(ddraw wineheaders)
-add_cab_target(ddraw 1)
+add_cd_file(TARGET ddraw DESTINATION reactos/system32)
 add_importlib_target(ddraw.spec)
index 840c321..ee6a8ff 100644 (file)
@@ -74,5 +74,5 @@ add_importlibs(wined3d
     ntdll)
 
 add_dependencies(wined3d wineheaders)
-add_cab_target(wined3d 1)
+add_cd_file(TARGET wined3d DESTINATION reactos/system32)
 add_importlib_target(wined3d.spec)
index 7514406..9048077 100644 (file)
@@ -9,4 +9,4 @@ set_entrypoint(kbda1 0)
 
 add_dependencies(kbda1 psdk)
 
-add_cab_target(kbda1 1)
+add_cd_file(TARGET kbda1 DESTINATION reactos/system32)
index dce4448..230100f 100644 (file)
@@ -9,4 +9,4 @@ set_entrypoint(kbda2 0)
 
 add_dependencies(kbda2 psdk)
 
-add_cab_target(kbda2 1)
+add_cd_file(TARGET kbda2 DESTINATION reactos/system32)
index 0a2cfd2..b35a9b1 100644 (file)
@@ -9,4 +9,4 @@ set_entrypoint(kbda3 0)
 
 add_dependencies(kbda3 psdk)
 
-add_cab_target(kbda3 1)
+add_cd_file(TARGET kbda3 DESTINATION reactos/system32)
index 5d1abef..72b3f90 100644 (file)
@@ -9,4 +9,4 @@ set_entrypoint(kbdal 0)
 
 add_dependencies(kbdal psdk)
 
-add_cab_target(kbdal 1)
+add_cd_file(TARGET kbdal DESTINATION reactos/system32)
index 6099675..f0e8eae 100644 (file)
@@ -9,4 +9,4 @@ set_entrypoint(kbdarme 0)
 
 add_dependencies(kbdarme psdk)
 
-add_cab_target(kbdarme 1)
+add_cd_file(TARGET kbdarme DESTINATION reactos/system32)
index bff4aa3..03ce9b7 100644 (file)
@@ -9,4 +9,4 @@ set_entrypoint(kbdarmw 0)
 
 add_dependencies(kbdarmw psdk)
 
-add_cab_target(kbdarmw 1)
+add_cd_file(TARGET kbdarmw DESTINATION reactos/system32)
index b7407ac..9af3917 100644 (file)
@@ -9,4 +9,4 @@ set_entrypoint(kbdaze 0)
 
 add_dependencies(kbdaze psdk)
 
-add_cab_target(kbdaze 1)
+add_cd_file(TARGET kbdaze DESTINATION reactos/system32)
index 9a6d149..1d4ba41 100644 (file)
@@ -9,4 +9,4 @@ set_entrypoint(kbdazel 0)
 
 add_dependencies(kbdazel psdk)
 
-add_cab_target(kbdazel 1)
+add_cd_file(TARGET kbdazel DESTINATION reactos/system32)
index ffac78d..bad5fa9 100644 (file)
@@ -9,4 +9,4 @@ set_entrypoint(kbdbe 0)
 
 add_dependencies(kbdbe psdk)
 
-add_cab_target(kbdbe 1)
+add_cd_file(TARGET kbdbe DESTINATION reactos/system32)
index d881c5f..256b0fe 100644 (file)
@@ -9,4 +9,4 @@ set_entrypoint(kbdbga 0)
 
 add_dependencies(kbdbga psdk)
 
-add_cab_target(kbdbga 1)
+add_cd_file(TARGET kbdbga DESTINATION reactos/system32)
index c0dfee9..dbf7373 100644 (file)
@@ -9,4 +9,4 @@ set_entrypoint(kbdbgm 0)
 
 add_dependencies(kbdbgm psdk)
 
-add_cab_target(kbdbgm 1)
+add_cd_file(TARGET kbdbgm DESTINATION reactos/system32)
index 814f52a..e785f56 100644 (file)
@@ -9,4 +9,4 @@ set_entrypoint(kbdbgt 0)
 
 add_dependencies(kbdbgt psdk)
 
-add_cab_target(kbdbgt 1)
+add_cd_file(TARGET kbdbgt DESTINATION reactos/system32)
index 704c5d8..4c314f9 100644 (file)
@@ -9,4 +9,4 @@ set_entrypoint(kbdblr 0)
 
 add_dependencies(kbdblr psdk)
 
-add_cab_target(kbdblr 1)
+add_cd_file(TARGET kbdblr DESTINATION reactos/system32)
index e51d229..0986462 100644 (file)
@@ -9,4 +9,4 @@ set_entrypoint(kbdbr 0)
 
 add_dependencies(kbdbr psdk)
 
-add_cab_target(kbdbr 1)
+add_cd_file(TARGET kbdbr DESTINATION reactos/system32)
index 6f42e87..7e03e04 100644 (file)
@@ -9,4 +9,4 @@ set_entrypoint(kbdbur 0)
 
 add_dependencies(kbdbur psdk)
 
-add_cab_target(kbdbur 1)
+add_cd_file(TARGET kbdbur DESTINATION reactos/system32)
index 3f2e431..7ad1d15 100644 (file)
@@ -9,4 +9,4 @@ set_entrypoint(kbdcan 0)
 
 add_dependencies(kbdcan psdk)
 
-add_cab_target(kbdcan 1)
+add_cd_file(TARGET kbdcan DESTINATION reactos/system32)
index 25d4073..3bbd9bb 100644 (file)
@@ -9,4 +9,4 @@ set_entrypoint(kbdcr 0)
 
 add_dependencies(kbdcr psdk)
 
-add_cab_target(kbdcr 1)
+add_cd_file(TARGET kbdcr DESTINATION reactos/system32)
index 7b1a642..67409dd 100644 (file)
@@ -9,4 +9,4 @@ set_entrypoint(kbdcz 0)
 
 add_dependencies(kbdcz psdk)
 
-add_cab_target(kbdcz 1)
+add_cd_file(TARGET kbdcz DESTINATION reactos/system32)
index 8534f7a..9aff245 100644 (file)
@@ -9,4 +9,4 @@ set_entrypoint(kbdcz1 0)
 
 add_dependencies(kbdcz1 psdk)
 
-add_cab_target(kbdcz1 1)
+add_cd_file(TARGET kbdcz1 DESTINATION reactos/system32)
index 576a649..c1d186a 100644 (file)
@@ -9,4 +9,4 @@ set_entrypoint(kbdda 0)
 
 add_dependencies(kbdda psdk)
 
-add_cab_target(kbdda 1)
+add_cd_file(TARGET kbdda DESTINATION reactos/system32)
index 73f4300..5015d49 100644 (file)
@@ -9,4 +9,4 @@ set_entrypoint(kbddv 0)
 
 add_dependencies(kbddv psdk)
 
-add_cab_target(kbddv 1)
+add_cd_file(TARGET kbddv DESTINATION reactos/system32)
index 308f3a6..d62d0d9 100644 (file)
@@ -9,4 +9,4 @@ set_entrypoint(kbdes 0)
 
 add_dependencies(kbdes psdk)
 
-add_cab_target(kbdes 1)
+add_cd_file(TARGET kbdes DESTINATION reactos/system32)
index b770a04..3b2d8c7 100644 (file)
@@ -9,4 +9,4 @@ set_entrypoint(kbdest 0)
 
 add_dependencies(kbdest psdk)
 
-add_cab_target(kbdest 1)
+add_cd_file(TARGET kbdest DESTINATION reactos/system32)
index c5a7d92..3083224 100644 (file)
@@ -9,4 +9,4 @@ set_entrypoint(kbdfc 0)
 
 add_dependencies(kbdfc psdk)
 
-add_cab_target(kbdfc 1)
+add_cd_file(TARGET kbdfc DESTINATION reactos/system32)
index 2ba9658..c0414cc 100644 (file)
@@ -9,4 +9,4 @@ set_entrypoint(kbdfi 0)
 
 add_dependencies(kbdfi psdk)
 
-add_cab_target(kbdfi 1)
+add_cd_file(TARGET kbdfi DESTINATION reactos/system32)
index c62571b..e0c2abc 100644 (file)
@@ -9,4 +9,4 @@ set_entrypoint(kbdfr 0)
 
 add_dependencies(kbdfr psdk)
 
-add_cab_target(kbdfr 1)
+add_cd_file(TARGET kbdfr DESTINATION reactos/system32)
index ef49d0d..d435218 100644 (file)
@@ -9,4 +9,4 @@ set_entrypoint(kbdgeo 0)
 
 add_dependencies(kbdgeo psdk)
 
-add_cab_target(kbdgeo 1)
+add_cd_file(TARGET kbdgeo DESTINATION reactos/system32)
index 538151f..fdaaf65 100644 (file)
@@ -9,4 +9,4 @@ set_entrypoint(kbdgerg 0)
 
 add_dependencies(kbdgerg psdk)
 
-add_cab_target(kbdgerg 1)
+add_cd_file(TARGET kbdgerg DESTINATION reactos/system32)
index 71d540c..e917ea4 100644 (file)
@@ -9,4 +9,4 @@ set_entrypoint(kbdgneo 0)
 
 add_dependencies(kbdgneo psdk)
 
-add_cab_target(kbdgneo 1)
+add_cd_file(TARGET kbdgneo DESTINATION reactos/system32)
index 4b0669e..98b8f36 100644 (file)
@@ -9,4 +9,4 @@ set_entrypoint(kbdgr 0)
 
 add_dependencies(kbdgr psdk)
 
-add_cab_target(kbdgr 1)
+add_cd_file(TARGET kbdgr DESTINATION reactos/system32)
index c5b599e..5207a12 100644 (file)
@@ -9,4 +9,4 @@ set_entrypoint(kbdgrist 0)
 
 add_dependencies(kbdgrist psdk)
 
-add_cab_target(kbdgrist 1)
+add_cd_file(TARGET kbdgrist DESTINATION reactos/system32)
index 1b52a60..e82510c 100644 (file)
@@ -9,4 +9,4 @@ set_entrypoint(kbdhe 0)
 
 add_dependencies(kbdhe psdk)
 
-add_cab_target(kbdhe 1)
+add_cd_file(TARGET kbdhe DESTINATION reactos/system32)
index 9881bb5..58ce4fd 100644 (file)
@@ -9,4 +9,4 @@ set_entrypoint(kbdheb 0)
 
 add_dependencies(kbdheb psdk)
 
-add_cab_target(kbdheb 1)
+add_cd_file(TARGET kbdheb DESTINATION reactos/system32)
index 09b6eb1..7a71e4f 100644 (file)
@@ -9,4 +9,4 @@ set_entrypoint(kbdhu 0)
 
 add_dependencies(kbdhu psdk)
 
-add_cab_target(kbdhu 1)
+add_cd_file(TARGET kbdhu DESTINATION reactos/system32)
index 55c7762..9a3b6f3 100644 (file)
@@ -9,4 +9,4 @@ set_entrypoint(kbdic 0)
 
 add_dependencies(kbdic psdk)
 
-add_cab_target(kbdic 1)
+add_cd_file(TARGET kbdic DESTINATION reactos/system32)
index 43f337e..c372bab 100644 (file)
@@ -9,4 +9,4 @@ set_entrypoint(kbdinasa 0)
 
 add_dependencies(kbdinasa psdk)
 
-add_cab_target(kbdinasa 1)
+add_cd_file(TARGET kbdinasa DESTINATION reactos/system32)
index 0fdc9c9..6c3bf12 100644 (file)
@@ -9,4 +9,4 @@ set_entrypoint(kbdinben 0)
 
 add_dependencies(kbdinben psdk)
 
-add_cab_target(kbdinben 1)
+add_cd_file(TARGET kbdinben DESTINATION reactos/system32)
index b8dade8..12fa2b5 100644 (file)
@@ -9,4 +9,4 @@ set_entrypoint(kbdindev 0)
 
 add_dependencies(kbdindev psdk)
 
-add_cab_target(kbdindev 1)
+add_cd_file(TARGET kbdindev DESTINATION reactos/system32)
index 6b5ceba..060d141 100644 (file)
@@ -9,4 +9,4 @@ set_entrypoint(kbdinguj 0)
 
 add_dependencies(kbdinguj psdk)
 
-add_cab_target(kbdinguj 1)
+add_cd_file(TARGET kbdinguj DESTINATION reactos/system32)
index d0c544d..b0ebe39 100644 (file)
@@ -9,4 +9,4 @@ set_entrypoint(kbdinmal 0)
 
 add_dependencies(kbdinmal psdk)
 
-add_cab_target(kbdinmal 1)
+add_cd_file(TARGET kbdinmal DESTINATION reactos/system32)
index 9a270b4..b12bd7c 100644 (file)
@@ -9,4 +9,4 @@ set_entrypoint(kbdir 0)
 
 add_dependencies(kbdir psdk)
 
-add_cab_target(kbdir 1)
+add_cd_file(TARGET kbdir DESTINATION reactos/system32)
index 19dae28..64e6fae 100644 (file)
@@ -9,4 +9,4 @@ set_entrypoint(kbdit 0)
 
 add_dependencies(kbdit psdk)
 
-add_cab_target(kbdit 1)
+add_cd_file(TARGET kbdit DESTINATION reactos/system32)
index 05c8f04..8a5ccec 100644 (file)
@@ -9,4 +9,4 @@ set_entrypoint(kbdja 0)
 
 add_dependencies(kbdja psdk)
 
-add_cab_target(kbdja 1)
+add_cd_file(TARGET kbdja DESTINATION reactos/system32)
index c9b491f..be53f75 100644 (file)
@@ -9,4 +9,4 @@ set_entrypoint(kbdkaz 0)
 
 add_dependencies(kbdkaz psdk)
 
-add_cab_target(kbdkaz 1)
+add_cd_file(TARGET kbdkaz DESTINATION reactos/system32)
index 4509a1a..0d9c69a 100644 (file)
@@ -9,4 +9,4 @@ set_entrypoint(kbdko 0)
 
 add_dependencies(kbdko psdk)
 
-add_cab_target(kbdko 1)
+add_cd_file(TARGET kbdko DESTINATION reactos/system32)
index 4956a9a..530886a 100644 (file)
@@ -9,4 +9,4 @@ set_entrypoint(kbdla 0)
 
 add_dependencies(kbdla psdk)
 
-add_cab_target(kbdla 1)
+add_cd_file(TARGET kbdla DESTINATION reactos/system32)
index 23b2137..d2d352f 100644 (file)
@@ -9,4 +9,4 @@ set_entrypoint(kbdlt1 0)
 
 add_dependencies(kbdlt1 psdk)
 
-add_cab_target(kbdlt1 1)
+add_cd_file(TARGET kbdlt1 DESTINATION reactos/system32)
index 2024d59..a5e2444 100644 (file)
@@ -9,4 +9,4 @@ set_entrypoint(kbdlv 0)
 
 add_dependencies(kbdlv psdk)
 
-add_cab_target(kbdlv 1)
+add_cd_file(TARGET kbdlv DESTINATION reactos/system32)
index 48cbb45..e890ecf 100644 (file)
@@ -9,4 +9,4 @@ set_entrypoint(kbdmac 0)
 
 add_dependencies(kbdmac psdk)
 
-add_cab_target(kbdmac 1)
+add_cd_file(TARGET kbdmac DESTINATION reactos/system32)
index 2c59d3a..b857dd4 100644 (file)
@@ -9,4 +9,4 @@ set_entrypoint(kbdne 0)
 
 add_dependencies(kbdne psdk)
 
-add_cab_target(kbdne 1)
+add_cd_file(TARGET kbdne DESTINATION reactos/system32)
index cd87119..cc73a4b 100644 (file)
@@ -9,4 +9,4 @@ set_entrypoint(kbdno 0)
 
 add_dependencies(kbdno psdk)
 
-add_cab_target(kbdno 1)
+add_cd_file(TARGET kbdno DESTINATION reactos/system32)
index f479f24..47dbd70 100644 (file)
@@ -9,4 +9,4 @@ set_entrypoint(kbdpl1 0)
 
 add_dependencies(kbdpl1 psdk)
 
-add_cab_target(kbdpl1 1)
+add_cd_file(TARGET kbdpl1 DESTINATION reactos/system32)
index 600cf6e..01595af 100644 (file)
@@ -9,4 +9,4 @@ set_entrypoint(kbdpo 0)
 
 add_dependencies(kbdpo psdk)
 
-add_cab_target(kbdpo 1)
+add_cd_file(TARGET kbdpo DESTINATION reactos/system32)
index a69ec46..8cc9905 100644 (file)
@@ -9,4 +9,4 @@ set_entrypoint(kbdro 0)
 
 add_dependencies(kbdro psdk)
 
-add_cab_target(kbdro 1)
+add_cd_file(TARGET kbdro DESTINATION reactos/system32)
index 82eeb39..53d59fb 100644 (file)
@@ -9,4 +9,4 @@ set_entrypoint(kbdru 0)
 
 add_dependencies(kbdru psdk)
 
-add_cab_target(kbdru 1)
+add_cd_file(TARGET kbdru DESTINATION reactos/system32)
index 330293d..6c63661 100644 (file)
@@ -9,4 +9,4 @@ set_entrypoint(kbdru1 0)
 
 add_dependencies(kbdru1 psdk)
 
-add_cab_target(kbdru1 1)
+add_cd_file(TARGET kbdru1 DESTINATION reactos/system32)
index ab0232b..c9011f3 100644 (file)
@@ -9,4 +9,4 @@ set_entrypoint(kbdsg 0)
 
 add_dependencies(kbdsg psdk)
 
-add_cab_target(kbdsg 1)
+add_cd_file(TARGET kbdsg DESTINATION reactos/system32)
index 96e0dcc..3d8141c 100644 (file)
@@ -9,4 +9,4 @@ set_entrypoint(kbdsk 0)
 
 add_dependencies(kbdsk psdk)
 
-add_cab_target(kbdsk 1)
+add_cd_file(TARGET kbdsk DESTINATION reactos/system32)
index 458fe83..4065838 100644 (file)
@@ -9,4 +9,4 @@ set_entrypoint(kbdsk1 0)
 
 add_dependencies(kbdsk1 psdk)
 
-add_cab_target(kbdsk1 1)
+add_cd_file(TARGET kbdsk1 DESTINATION reactos/system32)
index f3cfd32..0c63383 100644 (file)
@@ -9,4 +9,4 @@ set_entrypoint(kbdsw 0)
 
 add_dependencies(kbdsw psdk)
 
-add_cab_target(kbdsw 1)
+add_cd_file(TARGET kbdsw DESTINATION reactos/system32)
index d1dd958..aebb607 100644 (file)
@@ -9,4 +9,4 @@ set_entrypoint(kbdtat 0)
 
 add_dependencies(kbdtat psdk)
 
-add_cab_target(kbdtat 1)
+add_cd_file(TARGET kbdtat DESTINATION reactos/system32)
index 80ebeb2..8949fc1 100644 (file)
@@ -9,4 +9,4 @@ set_entrypoint(kbdth0 0)
 
 add_dependencies(kbdth0 psdk)
 
-add_cab_target(kbdth0 1)
+add_cd_file(TARGET kbdth0 DESTINATION reactos/system32)
index 893ecdc..f1b9d0f 100644 (file)
@@ -9,4 +9,4 @@ set_entrypoint(kbdth1 0)
 
 add_dependencies(kbdth1 psdk)
 
-add_cab_target(kbdth1 1)
+add_cd_file(TARGET kbdth1 DESTINATION reactos/system32)
index 59a6510..42548be 100644 (file)
@@ -9,4 +9,4 @@ set_entrypoint(kbdth2 0)
 
 add_dependencies(kbdth2 psdk)
 
-add_cab_target(kbdth2 1)
+add_cd_file(TARGET kbdth2 DESTINATION reactos/system32)
index dd82ec6..e6bfe9a 100644 (file)
@@ -9,4 +9,4 @@ set_entrypoint(kbdth3 0)
 
 add_dependencies(kbdth3 psdk)
 
-add_cab_target(kbdth3 1)
+add_cd_file(TARGET kbdth3 DESTINATION reactos/system32)
index dd77769..d02655a 100644 (file)
@@ -9,4 +9,4 @@ set_entrypoint(kbdtuf 0)
 
 add_dependencies(kbdtuf psdk)
 
-add_cab_target(kbdtuf 1)
+add_cd_file(TARGET kbdtuf DESTINATION reactos/system32)
index fc2fc71..03ecea2 100644 (file)
@@ -9,4 +9,4 @@ set_entrypoint(kbdtuq 0)
 
 add_dependencies(kbdtuq psdk)
 
-add_cab_target(kbdtuq 1)
+add_cd_file(TARGET kbdtuq DESTINATION reactos/system32)
index d8f254a..fb7579d 100644 (file)
@@ -9,4 +9,4 @@ set_entrypoint(kbduk 0)
 
 add_dependencies(kbduk psdk)
 
-add_cab_target(kbduk 1)
+add_cd_file(TARGET kbduk DESTINATION reactos/system32)
index 9128a20..72d2a3a 100644 (file)
@@ -9,4 +9,4 @@ set_entrypoint(kbdur 0)
 
 add_dependencies(kbdur psdk)
 
-add_cab_target(kbdur 1)
+add_cd_file(TARGET kbdur DESTINATION reactos/system32)
index b6d900d..08558ef 100644 (file)
@@ -9,4 +9,4 @@ set_entrypoint(kbdurs 0)
 
 add_dependencies(kbdurs psdk)
 
-add_cab_target(kbdurs 1)
+add_cd_file(TARGET kbdurs DESTINATION reactos/system32)
index 34b746c..7a79b6b 100644 (file)
@@ -8,4 +8,4 @@ set_entrypoint(kbdus 0)
 
 add_dependencies(kbdus psdk)
 
-add_cab_target(kbdus 1)
+add_cd_file(TARGET kbdus DESTINATION reactos/system32)
index 33b1f8e..c6af4f0 100644 (file)
@@ -9,4 +9,4 @@ set_entrypoint(kbdusa 0)
 
 add_dependencies(kbdusa psdk)
 
-add_cab_target(kbdusa 1)
+add_cd_file(TARGET kbdusa DESTINATION reactos/system32)
index 0b594bb..8efdd7e 100644 (file)
@@ -9,4 +9,4 @@ set_entrypoint(kbdusl 0)
 
 add_dependencies(kbdusl psdk)
 
-add_cab_target(kbdusl 1)
+add_cd_file(TARGET kbdusl DESTINATION reactos/system32)
index 555a427..90a9bfe 100644 (file)
@@ -9,4 +9,4 @@ set_entrypoint(kbdusr 0)
 
 add_dependencies(kbdusr psdk)
 
-add_cab_target(kbdusr 1)
+add_cd_file(TARGET kbdusr DESTINATION reactos/system32)
index c7cc26a..c6a7a5b 100644 (file)
@@ -9,4 +9,4 @@ set_entrypoint(kbdusx 0)
 
 add_dependencies(kbdusx psdk)
 
-add_cab_target(kbdusx 1)
+add_cd_file(TARGET kbdusx DESTINATION reactos/system32)
index 7487124..908ca10 100644 (file)
@@ -9,4 +9,4 @@ set_entrypoint(kbduzb 0)
 
 add_dependencies(kbduzb psdk)
 
-add_cab_target(kbduzb 1)
+add_cd_file(TARGET kbduzb DESTINATION reactos/system32)
index 5ee06e9..7efa67e 100644 (file)
@@ -9,4 +9,4 @@ set_entrypoint(kbdvntc 0)
 
 add_dependencies(kbdvntc psdk)
 
-add_cab_target(kbdvntc 1)
+add_cd_file(TARGET kbdvntc DESTINATION reactos/system32)
index ecbfad8..c0f2826 100644 (file)
@@ -9,4 +9,4 @@ set_entrypoint(kbdycc 0)
 
 add_dependencies(kbdycc psdk)
 
-add_cab_target(kbdycc 1)
+add_cd_file(TARGET kbdycc DESTINATION reactos/system32)
index 61687b7..ac0da16 100644 (file)
@@ -9,4 +9,4 @@ set_entrypoint(kbdycl 0)
 
 add_dependencies(kbdycl psdk)
 
-add_cab_target(kbdycl 1)
+add_cd_file(TARGET kbdycl DESTINATION reactos/system32)
index 94435b9..3ba5d7b 100644 (file)
@@ -18,4 +18,4 @@ add_importlibs(idndl kernel32)
 
 add_dependencies(idndl psdk)
 
-add_livecd_target(idndl reactos)
+add_cd_file(TARGET idndl DESTINATION reactos)
index dff520c..f2027d0 100644 (file)
@@ -58,6 +58,5 @@ set_image_base(ntdll ${baseaddress_ntdll})
 add_pch(ntdll ${CMAKE_CURRENT_SOURCE_DIR}/include/ntdll.h ${SOURCE})
 add_dependencies(ntdll ntstatus asm)
 
-add_minicd_target(ntdll reactos/system32 ntdll.dll)
-add_cab_target(ntdll 1)
+add_cd_file(TARGET ntdll DESTINATION reactos/system32 NO_CAB)
 add_importlib_target(def/ntdll.spec)
index dae34eb..d28db15 100644 (file)
@@ -26,4 +26,4 @@ add_importlibs(deskadp
 
 add_pch(deskadp ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
 
-add_cab_target(deskadp 1)
+add_cd_file(TARGET deskadp DESTINATION reactos/system32)
index 6b0f655..37a924d 100644 (file)
@@ -27,4 +27,4 @@ add_importlibs(deskmon
 
 add_pch(deskmon ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
 
-add_cab_target(deskmon 1)
+add_cd_file(TARGET deskmon DESTINATION reactos/system32)
index 5b63f59..b89c54f 100644 (file)
@@ -16,4 +16,4 @@ add_importlibs(devcpux
     kernel32
     ntdll)
 
-add_cab_target(devcpux 1)
+add_cd_file(TARGET devcpux DESTINATION reactos/system32)
index d758354..2d1fbf7 100644 (file)
@@ -25,4 +25,4 @@ add_importlibs(fontext
     kernel32
     ntdll)
 
-add_cab_target(fontext 1)
+add_cd_file(TARGET fontext DESTINATION reactos/system32)
index 7ef277b..a5beea5 100644 (file)
@@ -27,4 +27,4 @@ add_importlibs(slayer
 
 add_pch(slayer ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
 
-add_cab_target(slayer 1)
+add_cd_file(TARGET slayer DESTINATION reactos/system32)
index 87d336c..7863e84 100644 (file)
@@ -13,5 +13,5 @@ add_library(acledit SHARED ${SOURCE})
 
 set_module_type(acledit win32dll)
 add_importlibs(acledit msvcrt kernel32 ntdll)
-add_cab_target(acledit 1)
+add_cd_file(TARGET acledit DESTINATION reactos/system32)
 add_importlib_target(acledit.spec)
index 11955dd..8d8af78 100644 (file)
@@ -26,4 +26,4 @@ add_importlibs(aclui user32 gdi32 comctl32 ole32 oleaut32 advapi32 uxtheme msvcr
 
 add_pch(aclui ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
 
-add_cab_target(aclui 1)
+add_cd_file(TARGET aclui DESTINATION reactos/system32)
index 7fe72e8..ffed635 100644 (file)
@@ -18,4 +18,4 @@ target_link_libraries(activeds wine)
 
 add_importlibs(activeds msvcrt kernel32 ntdll)
 
-add_cab_target(activeds 1)
+add_cd_file(TARGET activeds DESTINATION reactos/system32)
index a3ebbb8..356e692 100644 (file)
@@ -39,4 +39,4 @@ add_importlibs(actxprxy
 
 add_definitions(-DREGISTER_PROXY_DLL -DPROXY_DELEGATION)
 
-add_cab_target(actxprxy 1)
+add_cd_file(TARGET actxprxy DESTINATION reactos/system32)
index e7e29db..067fce0 100644 (file)
@@ -61,5 +61,5 @@ target_link_libraries(advapi32
 add_importlibs(advapi32 rpcrt4 kernel32 ntdll msvcrt)
 
 add_pch(advapi32 ${CMAKE_CURRENT_SOURCE_DIR}/advapi32.h ${SOURCE})
-add_cab_target(advapi32 1)
+add_cd_file(TARGET advapi32 DESTINATION reactos/system32)
 add_importlib_target(advapi32.spec)
index f988c61..2b28ffa 100644 (file)
@@ -19,4 +19,4 @@ set_module_type(advpack win32dll)
 target_link_libraries(advpack wine)
 
 add_importlibs(advpack ole32 setupapi version advapi32 msvcrt kernel32 ntdll)
-add_cab_target(advpack 1)
+add_cd_file(TARGET advpack DESTINATION reactos/system32)
index 459360c..6976438 100644 (file)
@@ -40,4 +40,4 @@ add_importlibs(atl
 add_importlib_target(atl.spec)
 
 add_dependencies(atl atl_atliface_header)
-add_cab_target(atl 1)
+add_cd_file(TARGET atl DESTINATION reactos/system32)
index 9ed0f10..c9582fc 100644 (file)
@@ -20,4 +20,4 @@ set_module_type(authz win32dll)
 add_pch(authz ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
 add_importlibs(authz advapi32 msvcrt kernel32 ntdll)
 
-add_cab_target(authz 1)
+add_cd_file(TARGET authz DESTINATION reactos/system32)
index c3fc804..69a918f 100644 (file)
@@ -14,5 +14,5 @@ target_link_libraries(avicap32 wine)
 
 add_importlibs(avicap32 advapi32 user32 version msvcrt kernel32 ntdll)
 
-add_cab_target(avicap32 1)
+add_cd_file(TARGET avicap32 DESTINATION reactos/system32)
 add_importlib_target(avicap32.spec)
index ef6182a..37cdb3a 100644 (file)
@@ -43,4 +43,4 @@ add_importlibs(avifil32
     ntdll)
 
 add_importlib_target(avifil32.spec)
-add_cab_target(avifil32 1)
+add_cd_file(TARGET avifil32 DESTINATION reactos/system32)
index d696505..e2806a8 100644 (file)
@@ -15,4 +15,4 @@ add_importlib_target(batt.spec)
 
 add_importlibs(batt msvcrt kernel32 ntdll)
 
-add_cab_target(batt 1)
+add_cd_file(TARGET batt DESTINATION reactos/system32)
index 3079a73..490f2f0 100644 (file)
@@ -18,4 +18,4 @@ target_link_libraries(bcrypt wine)
 
 add_importlibs(bcrypt msvcrt kernel32 ntdll)
 
-add_cab_target(bcrypt 1)
+add_cd_file(TARGET bcrypt DESTINATION reactos/system32)
index 742da7c..db9852c 100644 (file)
@@ -14,4 +14,4 @@ add_importlibs(beepmidi winmm kernel32 ntdll msvcrt)
 add_importlib_target(beepmidi.spec)
 
 add_dependencies(beepmidi psdk)
-add_cab_target(beepmidi 1)
+add_cd_file(TARGET beepmidi DESTINATION reactos/system32)
index 05c6542..9d62e43 100644 (file)
@@ -62,4 +62,4 @@ add_importlibs(browseui
     kernel32
     ntdll)
 
-add_cab_target(browseui 1)
+add_cd_file(TARGET browseui DESTINATION reactos/system32)
index 769d682..39a7aee 100644 (file)
@@ -23,4 +23,4 @@ add_importlibs(cabinet kernel32 ntdll)
 add_importlib_target(cabinet.spec)
 
 add_dependencies(cabinet psdk)
-add_cab_target(cabinet 1)
+add_cd_file(TARGET cabinet DESTINATION reactos/system32)
index ff0bd90..321b349 100644 (file)
@@ -18,4 +18,4 @@ add_library(cards SHARED ${SOURCE})
 set_module_type(cards win32dll)
 add_importlibs(cards user32 gdi32 msvcrt kernel32)
 add_importlib_target(cards.spec)
-add_cab_target(cards 1)
+add_cd_file(TARGET cards DESTINATION reactos/system32)
index f607906..768a62e 100644 (file)
@@ -11,4 +11,4 @@ add_library(cfgmgr32 SHARED ${SOURCE})
 set_entrypoint(cfgmgr32 0)
 add_importlibs(cfgmgr32 setupapi kernel32 ntdll)
 add_dependencies(cfgmgr32 psdk)
-add_cab_target(cfgmgr32 1)
+add_cd_file(TARGET cfgmgr32 DESTINATION reactos/system32)
index 44bf9c5..76ab41a 100644 (file)
@@ -19,4 +19,4 @@ target_link_libraries(clusapi wine)
 
 add_importlibs(clusapi msvcrt kernel32 ntdll)
 
-add_cab_target(clusapi 1)
+add_cd_file(TARGET clusapi DESTINATION reactos/system32)
index d4adb65..ad08a5b 100644 (file)
@@ -22,4 +22,4 @@ target_link_libraries(comcat uuid wine)
 add_importlibs(comcat ole32 user32 advapi32 ntdll)
 
 add_dependencies(comcat psdk)
-add_cab_target(comcat 1)
+add_cd_file(TARGET comcat DESTINATION reactos/system32)
index e45cc97..450b205 100644 (file)
@@ -71,5 +71,5 @@ add_importlibs(comctl32
     kernel32
     ntdll)
 
-add_cab_target(comctl32 1)
+add_cd_file(TARGET comctl32 DESTINATION reactos/system32)
 add_importlib_target(comctl32.spec)
index 8d31d2d..acd43aa 100644 (file)
@@ -42,5 +42,5 @@ add_importlibs(comdlg32
     kernel32
     ntdll)
 
-add_cab_target(comdlg32 1)
+add_cd_file(TARGET comdlg32 DESTINATION reactos/system32)
 add_importlib_target(comdlg32.spec)
index ed89e61..5711492 100644 (file)
@@ -16,5 +16,5 @@ set_module_type(compstui win32dll)
 target_link_libraries(compstui wine)
 
 add_importlibs(compstui msvcrt kernel32 ntdll)
-add_cab_target(compstui 1)
+add_cd_file(TARGET compstui DESTINATION reactos/system32)
 add_importlib_target(compstui.spec)
index 92dfdb7..1814388 100644 (file)
@@ -21,4 +21,4 @@ target_link_libraries(credui wine)
 
 add_importlibs(credui advapi32 user32 comctl32 msvcrt kernel32 ntdll)
 add_importlib_target(credui.spec)
-add_cab_target(credui 1)
+add_cd_file(TARGET credui DESTINATION reactos/system32)
index f5f345c..9f184c2 100644 (file)
@@ -32,4 +32,4 @@ target_link_libraries(crtdll
 add_importlibs(crtdll kernel32 ntdll)
 add_pch(crtdll ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
 
-add_cab_target(crtdll 1)
+add_cd_file(TARGET crtdll DESTINATION reactos/system32)