From fd5ef6b1c186ed039bca99226696d507fd7955c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Gardou?= Date: Sat, 30 Oct 2010 09:53:53 +0000 Subject: [PATCH] [CMAKE] - add macros add_cab and add_cab_target to add files to reactos.dff - add bootcd target - make use of these macros to create bootcd and livecd Bootcd works and install things, but 2nd stage fails booting. We need debug symbols!!! svn path=/branches/cmake-bringup/; revision=49347 --- CMakeLists.txt | 53 ++---- CMakeMacros.cmake | 110 ++++++++----- .../kbswitch/kbsdll/CMakeLists.txt | 2 +- base/applications/network/arp/CMakeLists.txt | 2 +- base/applications/network/dwnl/CMakeLists.txt | 2 +- .../network/finger/CMakeLists.txt | 2 +- base/applications/network/ftp/CMakeLists.txt | 2 +- .../network/ipconfig/CMakeLists.txt | 2 +- base/applications/network/net/CMakeLists.txt | 2 +- .../network/netstat/CMakeLists.txt | 2 +- .../network/nslookup/CMakeLists.txt | 2 +- base/applications/network/ping/CMakeLists.txt | 2 +- .../applications/network/route/CMakeLists.txt | 2 +- .../network/telnet/CMakeLists.txt | 2 +- .../network/tracert/CMakeLists.txt | 2 +- .../applications/network/whois/CMakeLists.txt | 2 +- base/applications/shutdown/CMakeLists.txt | 2 +- base/applications/winhlp32/CMakeLists.txt | 2 +- base/services/audiosrv/CMakeLists.txt | 2 +- base/services/eventlog/CMakeLists.txt | 2 +- base/services/rpcss/CMakeLists.txt | 2 +- base/services/spoolsv/CMakeLists.txt | 2 +- base/services/svchost/CMakeLists.txt | 2 +- base/services/umpnpmgr/CMakeLists.txt | 2 +- base/setup/setup/CMakeLists.txt | 2 +- base/shell/explorer/CMakeLists.txt | 2 +- base/shell/explorer/notifyhook/CMakeLists.txt | 2 +- base/system/autochk/CMakeLists.txt | 2 +- base/system/lsass/CMakeLists.txt | 2 +- base/system/rundll32/CMakeLists.txt | 2 +- base/system/services/CMakeLists.txt | 2 +- base/system/smss/CMakeLists.txt | 2 +- base/system/userinit/CMakeLists.txt | 2 +- base/system/winlogon/CMakeLists.txt | 2 +- boot/CMakeLists.txt | 32 ++-- dll/cpl/access/CMakeLists.txt | 2 +- dll/cpl/appwiz/CMakeLists.txt | 2 +- dll/cpl/console/CMakeLists.txt | 2 +- dll/cpl/desk/CMakeLists.txt | 2 +- dll/cpl/hdwwiz/CMakeLists.txt | 2 +- dll/cpl/input/CMakeLists.txt | 2 +- dll/cpl/intl/CMakeLists.txt | 2 +- dll/cpl/joy/CMakeLists.txt | 2 +- dll/cpl/main/CMakeLists.txt | 2 +- dll/cpl/mmsys/CMakeLists.txt | 2 +- dll/cpl/ncpa/CMakeLists.txt | 2 +- dll/cpl/odbccp32/CMakeLists.txt | 2 +- dll/cpl/powercfg/CMakeLists.txt | 2 +- dll/cpl/sysdm/CMakeLists.txt | 2 +- dll/cpl/telephon/CMakeLists.txt | 2 +- dll/cpl/timedate/CMakeLists.txt | 2 +- dll/cpl/usrmgr/CMakeLists.txt | 2 +- dll/directx/amstream/CMakeLists.txt | 2 +- dll/directx/devenum/CMakeLists.txt | 2 +- dll/directx/dinput/CMakeLists.txt | 2 +- dll/directx/dsound/CMakeLists.txt | 2 +- dll/directx/dxdiagn/CMakeLists.txt | 2 +- dll/directx/ksuser/CMakeLists.txt | 2 +- dll/directx/qedit/CMakeLists.txt | 2 +- dll/directx/quartz/CMakeLists.txt | 2 +- dll/directx/wine/d3d8/CMakeLists.txt | 2 +- dll/directx/wine/d3d9/CMakeLists.txt | 2 +- dll/keyboard/kbdus/CMakeLists.txt | 2 +- dll/shellext/deskadp/CMakeLists.txt | 2 +- dll/shellext/deskmon/CMakeLists.txt | 2 +- dll/shellext/devcpux/CMakeLists.txt | 2 +- dll/shellext/fontext/CMakeLists.txt | 2 +- dll/shellext/slayer/CMakeLists.txt | 2 +- dll/win32/acledit/CMakeLists.txt | 2 +- dll/win32/aclui/CMakeLists.txt | 2 +- dll/win32/activeds/CMakeLists.txt | 2 +- dll/win32/actxprxy/CMakeLists.txt | 2 +- dll/win32/advapi32/CMakeLists.txt | 2 +- dll/win32/advpack/CMakeLists.txt | 2 +- dll/win32/atl/CMakeLists.txt | 2 +- dll/win32/authz/CMakeLists.txt | 2 +- dll/win32/avicap32/CMakeLists.txt | 2 +- dll/win32/avifil32/CMakeLists.txt | 2 +- dll/win32/batt/CMakeLists.txt | 2 +- dll/win32/bcrypt/CMakeLists.txt | 2 +- dll/win32/beepmidi/CMakeLists.txt | 2 +- dll/win32/browseui/CMakeLists.txt | 2 +- dll/win32/cabinet/CMakeLists.txt | 2 +- dll/win32/cards/CMakeLists.txt | 2 +- dll/win32/cfgmgr32/CMakeLists.txt | 2 +- dll/win32/clusapi/CMakeLists.txt | 2 +- dll/win32/comcat/CMakeLists.txt | 2 +- dll/win32/comctl32/CMakeLists.txt | 2 +- dll/win32/comdlg32/CMakeLists.txt | 2 +- dll/win32/compstui/CMakeLists.txt | 2 +- dll/win32/credui/CMakeLists.txt | 2 +- dll/win32/crtdll/CMakeLists.txt | 2 +- dll/win32/crypt32/CMakeLists.txt | 2 +- dll/win32/cryptdlg/CMakeLists.txt | 2 +- dll/win32/cryptdll/CMakeLists.txt | 2 +- dll/win32/cryptnet/CMakeLists.txt | 2 +- dll/win32/cryptui/CMakeLists.txt | 2 +- dll/win32/dbghelp/CMakeLists.txt | 2 +- dll/win32/dciman32/CMakeLists.txt | 2 +- dll/win32/devmgr/CMakeLists.txt | 2 +- dll/win32/dhcpcsvc/CMakeLists.txt | 2 +- dll/win32/dnsapi/CMakeLists.txt | 2 +- dll/win32/dwmapi/CMakeLists.txt | 2 +- dll/win32/faultrep/CMakeLists.txt | 2 +- dll/win32/fmifs/CMakeLists.txt | 2 +- dll/win32/fusion/CMakeLists.txt | 2 +- dll/win32/gdi32/CMakeLists.txt | 2 +- dll/win32/gdiplus/CMakeLists.txt | 2 +- dll/win32/getuname/CMakeLists.txt | 2 +- dll/win32/glu32/CMakeLists.txt | 2 +- dll/win32/hid/CMakeLists.txt | 2 +- dll/win32/hlink/CMakeLists.txt | 2 +- dll/win32/hnetcfg/CMakeLists.txt | 2 +- dll/win32/httpapi/CMakeLists.txt | 2 +- dll/win32/iccvid/CMakeLists.txt | 2 +- dll/win32/icmp/CMakeLists.txt | 2 +- dll/win32/imaadp32.acm/CMakeLists.txt | 2 +- dll/win32/imagehlp/CMakeLists.txt | 2 +- dll/win32/imm32/CMakeLists.txt | 2 +- dll/win32/inetcomm/CMakeLists.txt | 2 +- dll/win32/inetmib1/CMakeLists.txt | 2 +- dll/win32/initpki/CMakeLists.txt | 2 +- dll/win32/inseng/CMakeLists.txt | 2 +- dll/win32/iphlpapi/CMakeLists.txt | 2 +- dll/win32/iprtprio/CMakeLists.txt | 2 +- dll/win32/itircl/CMakeLists.txt | 2 +- dll/win32/itss/CMakeLists.txt | 2 +- dll/win32/jscript/CMakeLists.txt | 2 +- dll/win32/kernel32/CMakeLists.txt | 2 +- dll/win32/loadperf/CMakeLists.txt | 2 +- dll/win32/localspl/CMakeLists.txt | 2 +- dll/win32/localui/CMakeLists.txt | 2 +- dll/win32/lpk/CMakeLists.txt | 2 +- dll/win32/lsasrv/CMakeLists.txt | 2 +- dll/win32/lz32/CMakeLists.txt | 2 +- dll/win32/mapi32/CMakeLists.txt | 2 +- dll/win32/mciavi32/CMakeLists.txt | 2 +- dll/win32/mcicda/CMakeLists.txt | 2 +- dll/win32/mciqtz32/CMakeLists.txt | 2 +- dll/win32/mciseq/CMakeLists.txt | 2 +- dll/win32/mciwave/CMakeLists.txt | 2 +- dll/win32/mlang/CMakeLists.txt | 2 +- dll/win32/mmdrv/CMakeLists.txt | 2 +- dll/win32/modemui/CMakeLists.txt | 2 +- dll/win32/mpr/CMakeLists.txt | 2 +- dll/win32/mprapi/CMakeLists.txt | 2 +- dll/win32/msacm32/CMakeLists.txt | 2 +- dll/win32/msacm32/msacm32.drv/CMakeLists.txt | 2 +- dll/win32/msadp32.acm/CMakeLists.txt | 2 +- dll/win32/msafd/CMakeLists.txt | 2 +- dll/win32/mscat32/CMakeLists.txt | 2 +- dll/win32/mscms/CMakeLists.txt | 2 +- dll/win32/mscoree/CMakeLists.txt | 2 +- dll/win32/msctf/CMakeLists.txt | 2 +- dll/win32/msftedit/CMakeLists.txt | 2 +- dll/win32/msg711.acm/CMakeLists.txt | 2 +- dll/win32/msgina/CMakeLists.txt | 2 +- dll/win32/msgsm32.acm/CMakeLists.txt | 2 +- dll/win32/mshtml.tlb/CMakeLists.txt | 2 +- dll/win32/mshtml/CMakeLists.txt | 2 +- dll/win32/msimg32/CMakeLists.txt | 2 +- dll/win32/msimtf/CMakeLists.txt | 2 +- dll/win32/msisip/CMakeLists.txt | 2 +- dll/win32/msnet32/CMakeLists.txt | 2 +- dll/win32/msrle32/CMakeLists.txt | 2 +- dll/win32/mssign32/CMakeLists.txt | 2 +- dll/win32/mssip32/CMakeLists.txt | 2 +- dll/win32/mstask/CMakeLists.txt | 2 +- dll/win32/msvcrt/CMakeLists.txt | 2 +- dll/win32/msvcrt20/CMakeLists.txt | 2 +- dll/win32/msvcrt40/CMakeLists.txt | 2 +- dll/win32/msvfw32/CMakeLists.txt | 2 +- dll/win32/msvidc32/CMakeLists.txt | 2 +- dll/win32/mswsock/CMakeLists.txt | 2 +- dll/win32/msxml3/CMakeLists.txt | 2 +- dll/win32/nddeapi/CMakeLists.txt | 2 +- dll/win32/netapi32/CMakeLists.txt | 2 +- dll/win32/netcfgx/CMakeLists.txt | 2 +- dll/win32/netevent/CMakeLists.txt | 2 +- dll/win32/netid/CMakeLists.txt | 2 +- dll/win32/netshell/CMakeLists.txt | 2 +- dll/win32/newdev/CMakeLists.txt | 2 +- dll/win32/ntdsapi/CMakeLists.txt | 2 +- dll/win32/ntlanman/CMakeLists.txt | 2 +- dll/win32/ntmarta/CMakeLists.txt | 2 +- dll/win32/ntprint/CMakeLists.txt | 2 +- dll/win32/objsel/CMakeLists.txt | 2 +- dll/win32/odbc32/CMakeLists.txt | 2 +- dll/win32/odbccp32/CMakeLists.txt | 2 +- dll/win32/ole32/CMakeLists.txt | 2 +- dll/win32/oleacc/CMakeLists.txt | 2 +- dll/win32/oleaut32/CMakeLists.txt | 2 +- dll/win32/olecli32/CMakeLists.txt | 2 +- dll/win32/oledlg/CMakeLists.txt | 2 +- dll/win32/olepro32/CMakeLists.txt | 2 +- dll/win32/olesvr32/CMakeLists.txt | 2 +- dll/win32/olethk32/CMakeLists.txt | 2 +- dll/win32/opengl32/CMakeLists.txt | 2 +- dll/win32/pdh/CMakeLists.txt | 2 +- dll/win32/pidgen/CMakeLists.txt | 2 +- dll/win32/powrprof/CMakeLists.txt | 2 +- dll/win32/printui/CMakeLists.txt | 2 +- dll/win32/psapi/CMakeLists.txt | 2 +- dll/win32/pstorec/CMakeLists.txt | 2 +- dll/win32/query/CMakeLists.txt | 2 +- dll/win32/rasadhlp/CMakeLists.txt | 2 +- dll/win32/rasapi32/CMakeLists.txt | 2 +- dll/win32/rasdlg/CMakeLists.txt | 2 +- dll/win32/rasman/CMakeLists.txt | 2 +- dll/win32/resutils/CMakeLists.txt | 2 +- dll/win32/riched20/CMakeLists.txt | 2 +- dll/win32/riched32/CMakeLists.txt | 2 +- dll/win32/rpcrt4/CMakeLists.txt | 2 +- dll/win32/rsabase/CMakeLists.txt | 2 +- dll/win32/rsaenh/CMakeLists.txt | 2 +- dll/win32/samlib/CMakeLists.txt | 2 +- dll/win32/sccbase/CMakeLists.txt | 2 +- dll/win32/schannel/CMakeLists.txt | 2 +- dll/win32/secur32/CMakeLists.txt | 2 +- dll/win32/sensapi/CMakeLists.txt | 2 +- dll/win32/serialui/CMakeLists.txt | 2 +- dll/win32/setupapi/CMakeLists.txt | 2 +- dll/win32/sfc/CMakeLists.txt | 2 +- dll/win32/sfc_os/CMakeLists.txt | 2 +- dll/win32/shdocvw/CMakeLists.txt | 2 +- dll/win32/shell32/CMakeLists.txt | 2 +- dll/win32/shimgvw/CMakeLists.txt | 2 +- dll/win32/shlwapi/CMakeLists.txt | 2 +- dll/win32/slbcsp/CMakeLists.txt | 2 +- dll/win32/smdll/CMakeLists.txt | 2 +- dll/win32/sndblst/CMakeLists.txt | 2 +- dll/win32/snmpapi/CMakeLists.txt | 2 +- dll/win32/spoolss/CMakeLists.txt | 2 +- dll/win32/stdole2.tlb/CMakeLists.txt | 2 +- dll/win32/stdole32.tlb/CMakeLists.txt | 2 +- dll/win32/sti/CMakeLists.txt | 2 +- dll/win32/syssetup/CMakeLists.txt | 2 +- dll/win32/t2embed/CMakeLists.txt | 2 +- dll/win32/traffic/CMakeLists.txt | 2 +- dll/win32/twain_32/CMakeLists.txt | 2 +- dll/win32/uext2/CMakeLists.txt | 2 +- dll/win32/ufat/CMakeLists.txt | 2 +- dll/win32/ufatx/CMakeLists.txt | 2 +- dll/win32/untfs/CMakeLists.txt | 2 +- dll/win32/url/CMakeLists.txt | 2 +- dll/win32/urlmon/CMakeLists.txt | 2 +- dll/win32/user32/CMakeLists.txt | 2 +- dll/win32/userenv/CMakeLists.txt | 2 +- dll/win32/usp10/CMakeLists.txt | 2 +- dll/win32/uxtheme/CMakeLists.txt | 2 +- dll/win32/vdmdbg/CMakeLists.txt | 2 +- dll/win32/version/CMakeLists.txt | 2 +- dll/win32/windowscodecs/CMakeLists.txt | 2 +- dll/win32/winhttp/CMakeLists.txt | 2 +- dll/win32/wininet/CMakeLists.txt | 2 +- dll/win32/winmm/CMakeLists.txt | 2 +- dll/win32/winmm/midimap/CMakeLists.txt | 2 +- dll/win32/winspool/CMakeLists.txt | 2 +- dll/win32/winsta/CMakeLists.txt | 2 +- dll/win32/wintrust/CMakeLists.txt | 2 +- dll/win32/wldap32/CMakeLists.txt | 2 +- dll/win32/ws2_32/CMakeLists.txt | 2 +- dll/win32/ws2_32_new/CMakeLists.txt | 2 +- dll/win32/ws2help/CMakeLists.txt | 2 +- dll/win32/wshirda/CMakeLists.txt | 2 +- dll/win32/wsock32/CMakeLists.txt | 2 +- dll/win32/wtsapi32/CMakeLists.txt | 2 +- dll/win32/wuapi/CMakeLists.txt | 2 +- dll/win32/xinput1_1/CMakeLists.txt | 2 +- dll/win32/xinput1_2/CMakeLists.txt | 2 +- dll/win32/xinput1_3/CMakeLists.txt | 2 +- dll/win32/xinput9_1_0/CMakeLists.txt | 2 +- dll/win32/xmllite/CMakeLists.txt | 2 +- drivers/base/beep/CMakeLists.txt | 2 +- drivers/base/bootvid/CMakeLists.txt | 2 +- drivers/base/nmidebug/CMakeLists.txt | 1 + drivers/base/null/CMakeLists.txt | 2 +- drivers/filesystems/fs_rec/CMakeLists.txt | 2 +- drivers/filesystems/msfs/CMakeLists.txt | 2 +- drivers/filesystems/npfs/CMakeLists.txt | 2 +- drivers/input/mouclass/CMakeLists.txt | 2 +- drivers/network/afd/CMakeLists.txt | 2 +- drivers/network/dd/ne2000/CMakeLists.txt | 2 +- drivers/network/dd/pcnet/CMakeLists.txt | 2 +- drivers/network/ndis/CMakeLists.txt | 2 +- drivers/network/tcpip/CMakeLists.txt | 2 +- drivers/network/tdi/CMakeLists.txt | 2 +- drivers/setup/blue/CMakeLists.txt | 2 +- .../usb/nt4compat/usbdriver/CMakeLists.txt | 2 +- .../video/displays/framebuf/CMakeLists.txt | 2 +- drivers/video/displays/vga/CMakeLists.txt | 2 +- drivers/video/font/ftfd/CMakeLists.txt | 2 +- drivers/video/miniport/vbe/CMakeLists.txt | 2 +- drivers/video/miniport/vga/CMakeLists.txt | 2 +- drivers/video/miniport/vga_new/CMakeLists.txt | 2 +- drivers/video/videoprt/CMakeLists.txt | 2 +- hal/CMakeLists.txt | 2 +- media/CMakeLists.txt | 10 +- media/fonts/CMakeLists.txt | 2 +- media/inf/CMakeLists.txt | 2 +- media/nls/CMakeLists.txt | 66 +++++++- media/vgafonts/CMakeLists.txt | 4 +- ros_cd.cmake | 155 ++++++++++++++++++ subsystems/win32/csrss/CMakeLists.txt | 2 +- subsystems/win32/csrss/csrsrv/CMakeLists.txt | 2 +- .../win32/csrss/win32csr/CMakeLists.txt | 2 +- subsystems/win32/win32k/CMakeLists.txt | 2 +- 307 files changed, 631 insertions(+), 398 deletions(-) create mode 100644 ros_cd.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index da6506dee97..27a2c5ef6b8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -47,6 +47,18 @@ endif() else() +#Some cleanup +file(REMOVE ${REACTOS_BINARY_DIR}/boot/ros_livecd.txt) +file(REMOVE ${REACTOS_BINARY_DIR}/boot/ros_livecd_target.txt) +file(REMOVE ${REACTOS_BINARY_DIR}/boot/ros_minicd.txt) +file(REMOVE ${REACTOS_BINARY_DIR}/boot/ros_minicd_target.txt) +file(REMOVE ${REACTOS_BINARY_DIR}/boot/ros_cab.txt) +file(REMOVE ${REACTOS_BINARY_DIR}/boot/ros_cab_target.txt) + +#Some useful variables +set(LIVECD_DIR "${REACTOS_BINARY_DIR}/boot/livecd") +set(BOOTCD_DIR "${REACTOS_BINARY_DIR}/boot/bootcd") + # Activate support for assembly source files enable_language(ASM) @@ -100,44 +112,6 @@ add_subdirectory(include/reactos/idl) add_subdirectory(include/reactos/wine) add_subdirectory(include/reactos/mc) -#minicd target -set(BOOTCD_DIR "${REACTOS_BINARY_DIR}/boot/bootcd") - -file(MAKE_DIRECTORY "${BOOTCD_DIR}") -file(MAKE_DIRECTORY "${BOOTCD_DIR}/loader") -file(MAKE_DIRECTORY "${BOOTCD_DIR}/reactos") -file(MAKE_DIRECTORY "${BOOTCD_DIR}/reactos/system32") - -add_custom_target(minicd - COMMAND native-cdmake -v -j -m -b ${CMAKE_CURRENT_BINARY_DIR}/boot/freeldr/bootsect/isoboot.bin ${BOOTCD_DIR} REACTOS ${REACTOS_BINARY_DIR}/minicd.iso - DEPENDS native-cdmake) - -add_minicd(${REACTOS_SOURCE_DIR}/boot/bootdata/bootcd.ini "" freeldr.ini) -set_directory_properties(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${REACTOS_BINARY_DIR}/minicd.iso) - -#livecd target -set(LIVECD_DIR "${REACTOS_BINARY_DIR}/boot/livecd") - -file(MAKE_DIRECTORY "${LIVECD_DIR}") -file(MAKE_DIRECTORY "${LIVECD_DIR}/loader") -file(MAKE_DIRECTORY "${LIVECD_DIR}/Profiles") -file(MAKE_DIRECTORY "${LIVECD_DIR}/Profiles/All Users") -file(MAKE_DIRECTORY "${LIVECD_DIR}/Profiles/All Users/Desktop") -file(MAKE_DIRECTORY "${LIVECD_DIR}/Profiles/Default User") -file(MAKE_DIRECTORY "${LIVECD_DIR}/Profiles/Default User/Desktop") -file(MAKE_DIRECTORY "${LIVECD_DIR}/Profiles/Default User/My Documents") -file(MAKE_DIRECTORY "${LIVECD_DIR}/reactos") -file(MAKE_DIRECTORY "${LIVECD_DIR}/reactos/inf") -file(MAKE_DIRECTORY "${LIVECD_DIR}/reactos/fonts") -file(MAKE_DIRECTORY "${LIVECD_DIR}/reactos/system32") -file(MAKE_DIRECTORY "${LIVECD_DIR}/reactos/system32/config") - -add_custom_target(livecd - COMMAND native-cdmake -v -j -m -b ${CMAKE_CURRENT_BINARY_DIR}/boot/freeldr/bootsect/isoboot.bin ${LIVECD_DIR} REACTOS ${REACTOS_BINARY_DIR}/livecd.iso - DEPENDS native-cdmake) -add_livecd(${REACTOS_SOURCE_DIR}/boot/bootdata/livecd.ini "" freeldr.ini) -set_directory_properties(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${REACTOS_BINARY_DIR}/livecd.iso) - include(baseaddress.cmake) add_subdirectory(base) @@ -207,5 +181,8 @@ add_custom_command( add_custom_target(gendib_generated ALL DEPENDS ${OUTPUT_FILES}) +#bootcd and livecd +include(ros_cd.cmake) + endif() diff --git a/CMakeMacros.cmake b/CMakeMacros.cmake index d0a858b6a2d..05558ea426b 100644 --- a/CMakeMacros.cmake +++ b/CMakeMacros.cmake @@ -117,62 +117,86 @@ MACRO(ADD_INTERFACE_DEFINITIONS TARGET) ENDMACRO() MACRO(add_minicd_target _targetname _dir) # optional parameter: _nameoncd - get_target_property(FILENAME ${_targetname} LOCATION) - - if("${ARGN}" STREQUAL "") - get_filename_component(_nameoncd ${FILENAME} NAME) - else() - set(_nameoncd ${ARGN}) - endif() - - add_custom_target(${_targetname}_minicd - COMMAND ${CMAKE_COMMAND} -E copy ${FILENAME} ${BOOTCD_DIR}/${_dir}/${_nameoncd} - DEPENDS ${_targetname}) - set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${BOOTCD_DIR}/${_dir}/${_nameoncd}) - - add_dependencies(minicd ${_targetname}_minicd) + if("${ARGN}" STREQUAL "") + get_target_property(FILENAME ${_targetname} LOCATION) + get_filename_component(_nameoncd ${FILENAME} NAME) + else() + set(_nameoncd ${ARGN}) + endif() + + file(APPEND ${REACTOS_BINARY_DIR}/boot/ros_minicd_target.txt "${_targetname}\t${_dir}\t${_nameoncd}\n") ENDMACRO(add_minicd_target) MACRO(add_minicd FILENAME _dir _nameoncd) - add_custom_target(${_nameoncd}_minicd - COMMAND ${CMAKE_COMMAND} -E copy ${FILENAME} ${BOOTCD_DIR}/${_dir}/${_nameoncd} - DEPENDS ${FILENAME}) - set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${BOOTCD_DIR}/${_dir}/${_nameoncd}) - - add_dependencies(minicd ${_nameoncd}_minicd) + file(APPEND ${REACTOS_BINARY_DIR}/boot/ros_minicd.txt "${FILENAME}\t${_dir}\t${_nameoncd}\n") ENDMACRO(add_minicd) macro(set_cpp) include_directories(BEFORE ${REACTOS_SOURCE_DIR}/lib/3rdparty/stlport/stlport) set(IS_CPP 1) endmacro() - + MACRO(add_livecd_target _targetname _dir )# optional parameter : _nameoncd - - get_target_property(FILENAME ${_targetname} LOCATION) - - if("${ARGN}" STREQUAL "") + if("${ARGN}" STREQUAL "") + get_target_property(FILENAME ${_targetname} LOCATION) get_filename_component(_nameoncd ${FILENAME} NAME) else() set(_nameoncd ${ARGN}) - endif() - - add_custom_target(${_targetname}_livecd - COMMAND ${CMAKE_COMMAND} -E copy ${FILENAME} ${LIVECD_DIR}/${_dir}/${_nameoncd} - DEPENDS ${_targetname}) - set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${LIVECD_DIR}/${_dir}/${_nameoncd}) - - add_dependencies(livecd ${_targetname}_livecd) -ENDMACRO(add_livecd_target) - -MACRO(add_livecd FILENAME _dir _nameoncd) - add_custom_target(${_nameoncd}_livecd - COMMAND ${CMAKE_COMMAND} -E copy ${FILENAME} ${LIVECD_DIR}/${_dir}/${_nameoncd} - DEPENDS ${FILENAME}) - set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${LIVECD_DIR}/${_dir}/${_nameoncd}) - - add_dependencies(livecd ${_nameoncd}_livecd) -ENDMACRO(add_livecd) + endif() + + file(APPEND ${REACTOS_BINARY_DIR}/boot/ros_livecd_target.txt "${_targetname}\t${_dir}\t${_nameoncd}\n") +ENDMACRO(add_livecd_target) + +MACRO(add_livecd FILENAME _dir)# optional parameter : _nameoncd + if("${ARGN}" STREQUAL "") + get_filename_component(_nameoncd ${FILENAME} NAME) + else() + set(_nameoncd ${ARGN}) + endif() + file(APPEND ${REACTOS_BINARY_DIR}/boot/ros_livecd.txt "${FILENAME}\t${_dir}\t${_nameoncd}\n") +ENDMACRO(add_livecd) + +macro(cab_to_dir _dir_num _var_name) +# 1 = system32 +# 2 = system32\drivers +# 3 = Fonts +# 4 = +# 5 = system32\drivers\etc +# 6 = inf +# 7 = bin +# 8 = media + if(${_dir_num} STREQUAL "1") + set(${_var_name} "reactos/system32") + elseif(${_dir_num} STREQUAL "2") + set(${_var_name} "reactos/system32/drivers") + elseif(${_dir_num} STREQUAL "3") + set(${_var_name} "reactos/fonts") + elseif(${_dir_num} STREQUAL "4") + set(${_var_name} "reactos") + elseif(${_dir_num} STREQUAL "5") + set(${_var_name} "reactos/system32/drivers/etc") + elseif(${_dir_num} STREQUAL "6") + set(${_var_name} "reactos/inf") + elseif(${_dir_num} STREQUAL "7") + set(${_var_name} "reactos/bin") + elseif(${_dir_num} STREQUAL "8") + set(${_var_name} "reactos/system32/drivers") + else() + message(FATAL_ERROR "Wrong directory ${_dir_num}") + endif() +endmacro() + +MACRO(add_cab_target _targetname _num ) + file(APPEND ${REACTOS_BINARY_DIR}/boot/ros_cab_target.txt "${_targetname}\t${_num}\n") + cab_to_dir(${_num} _dir) + add_livecd_target(${_targetname} ${_dir}) +ENDMACRO(add_cab_target) + +MACRO(add_cab FILENAME _num) + file(APPEND ${REACTOS_BINARY_DIR}/boot/ros_cab.txt "${FILENAME}\t${_num}\n") + cab_to_dir(${_num} _dir) + add_livecd(${FILENAME} ${_dir}) +ENDMACRO(add_cab) macro(custom_incdefs) if(NOT DEFINED result_incs) #rpc_defines diff --git a/base/applications/kbswitch/kbsdll/CMakeLists.txt b/base/applications/kbswitch/kbsdll/CMakeLists.txt index d46b9f54804..68810c1bd69 100644 --- a/base/applications/kbswitch/kbsdll/CMakeLists.txt +++ b/base/applications/kbswitch/kbsdll/CMakeLists.txt @@ -11,4 +11,4 @@ set_module_type(kbsdll win32dll) add_importlibs(kbsdll user32 comctl32 kernel32) add_dependencies(kbsdll kbsdll_def) -add_livecd_target(kbsdll reactos/system32) +add_cab_target(kbsdll 1) diff --git a/base/applications/network/arp/CMakeLists.txt b/base/applications/network/arp/CMakeLists.txt index 07185e7bf51..9922f6960e2 100644 --- a/base/applications/network/arp/CMakeLists.txt +++ b/base/applications/network/arp/CMakeLists.txt @@ -5,4 +5,4 @@ set_module_type(arp win32cui) add_importlibs(arp iphlpapi ws2_32 shlwapi msvcrt kernel32) -add_livecd_target(arp reactos/system32) \ No newline at end of file +add_cab_target(arp 1) \ No newline at end of file diff --git a/base/applications/network/dwnl/CMakeLists.txt b/base/applications/network/dwnl/CMakeLists.txt index 834a9e1f314..30759d2dbe0 100644 --- a/base/applications/network/dwnl/CMakeLists.txt +++ b/base/applications/network/dwnl/CMakeLists.txt @@ -9,4 +9,4 @@ target_link_libraries(dwnl uuid) add_importlibs(dwnl urlmon wininet msvcrt kernel32) -add_livecd_target(dwnl reactos/system32) \ No newline at end of file +add_cab_target(dwnl 1) \ No newline at end of file diff --git a/base/applications/network/finger/CMakeLists.txt b/base/applications/network/finger/CMakeLists.txt index 1d0a54ea857..b1923e209c2 100644 --- a/base/applications/network/finger/CMakeLists.txt +++ b/base/applications/network/finger/CMakeLists.txt @@ -11,4 +11,4 @@ set_module_type(finger win32cui) add_importlibs(finger ws2_32 msvcrt kernel32) -add_livecd_target(finger reactos/system32) \ No newline at end of file +add_cab_target(finger 1) \ No newline at end of file diff --git a/base/applications/network/ftp/CMakeLists.txt b/base/applications/network/ftp/CMakeLists.txt index 41bc9d1ccbb..663c2be2724 100644 --- a/base/applications/network/ftp/CMakeLists.txt +++ b/base/applications/network/ftp/CMakeLists.txt @@ -12,4 +12,4 @@ set_module_type(ftp win32cui) add_importlibs(ftp ws2_32 iphlpapi msvcrt kernel32) -add_livecd_target(ftp reactos/system32) \ No newline at end of file +add_cab_target(ftp 1) \ No newline at end of file diff --git a/base/applications/network/ipconfig/CMakeLists.txt b/base/applications/network/ipconfig/CMakeLists.txt index ef2f4df6c44..5e700959c31 100644 --- a/base/applications/network/ipconfig/CMakeLists.txt +++ b/base/applications/network/ipconfig/CMakeLists.txt @@ -5,4 +5,4 @@ set_module_type(ipconfig win32cui) add_importlibs(ipconfig user32 iphlpapi advapi32 msvcrt kernel32) -add_livecd_target(ipconfig reactos/system32) \ No newline at end of file +add_cab_target(ipconfig 1) \ No newline at end of file diff --git a/base/applications/network/net/CMakeLists.txt b/base/applications/network/net/CMakeLists.txt index 189f55c24bc..c5669c19af3 100644 --- a/base/applications/network/net/CMakeLists.txt +++ b/base/applications/network/net/CMakeLists.txt @@ -14,4 +14,4 @@ set_module_type(net win32cui) add_importlibs(net ws2_32 msvcrt kernel32) -add_livecd_target(net reactos/system32) \ No newline at end of file +add_cab_target(net 1) \ No newline at end of file diff --git a/base/applications/network/netstat/CMakeLists.txt b/base/applications/network/netstat/CMakeLists.txt index 961c4db0230..e2f20f798c0 100644 --- a/base/applications/network/netstat/CMakeLists.txt +++ b/base/applications/network/netstat/CMakeLists.txt @@ -5,4 +5,4 @@ set_module_type(netstat win32cui) add_importlibs(netstat user32 ws2_32 snmpapi iphlpapi msvcrt kernel32) -add_livecd_target(netstat reactos/system32) \ No newline at end of file +add_cab_target(netstat 1) \ No newline at end of file diff --git a/base/applications/network/nslookup/CMakeLists.txt b/base/applications/network/nslookup/CMakeLists.txt index 135c66c72b3..5f97ca4e379 100644 --- a/base/applications/network/nslookup/CMakeLists.txt +++ b/base/applications/network/nslookup/CMakeLists.txt @@ -8,4 +8,4 @@ set_module_type(nslookup win32cui) add_importlibs(nslookup user32 ws2_32 snmpapi iphlpapi msvcrt kernel32) -add_livecd_target(nslookup reactos/system32) \ No newline at end of file +add_cab_target(nslookup 1) \ No newline at end of file diff --git a/base/applications/network/ping/CMakeLists.txt b/base/applications/network/ping/CMakeLists.txt index a49124d1c01..cab7705e4d5 100644 --- a/base/applications/network/ping/CMakeLists.txt +++ b/base/applications/network/ping/CMakeLists.txt @@ -6,4 +6,4 @@ set_module_type(ping win32cui) add_importlibs(ping ws2_32 msvcrt kernel32) -add_livecd_target(ping reactos/system32) \ No newline at end of file +add_cab_target(ping 1) \ No newline at end of file diff --git a/base/applications/network/route/CMakeLists.txt b/base/applications/network/route/CMakeLists.txt index e3eb54fe32a..67dd0cbd6b9 100644 --- a/base/applications/network/route/CMakeLists.txt +++ b/base/applications/network/route/CMakeLists.txt @@ -6,4 +6,4 @@ add_executable(route route.c route.rc) set_module_type(route win32cui) add_importlibs(route ws2_32 iphlpapi msvcrt kernel32) -add_livecd_target(route reactos/system32) \ No newline at end of file +add_cab_target(route 1) \ No newline at end of file diff --git a/base/applications/network/telnet/CMakeLists.txt b/base/applications/network/telnet/CMakeLists.txt index 5ef75fef152..4f369a8c8dc 100644 --- a/base/applications/network/telnet/CMakeLists.txt +++ b/base/applications/network/telnet/CMakeLists.txt @@ -28,4 +28,4 @@ set_module_type(telnet win32cui) add_importlibs(telnet ws2_32 user32 kernel32 msvcrt) -add_livecd_target(telnet reactos/system32) \ No newline at end of file +add_cab_target(telnet 1) \ No newline at end of file diff --git a/base/applications/network/tracert/CMakeLists.txt b/base/applications/network/tracert/CMakeLists.txt index d07d58cced9..d0c4f2f88ea 100644 --- a/base/applications/network/tracert/CMakeLists.txt +++ b/base/applications/network/tracert/CMakeLists.txt @@ -6,4 +6,4 @@ set_module_type(tracert win32cui) add_importlibs(tracert ws2_32 msvcrt kernel32) -add_livecd_target(tracert reactos/system32) \ No newline at end of file +add_cab_target(tracert 1) \ No newline at end of file diff --git a/base/applications/network/whois/CMakeLists.txt b/base/applications/network/whois/CMakeLists.txt index 5487cb20510..c57dca1b439 100644 --- a/base/applications/network/whois/CMakeLists.txt +++ b/base/applications/network/whois/CMakeLists.txt @@ -5,4 +5,4 @@ set_module_type(whois win32cui) add_importlibs(whois ws2_32 msvcrt kernel32) -add_livecd_target(whois reactos/system32) \ No newline at end of file +add_cab_target(whois 1) \ No newline at end of file diff --git a/base/applications/shutdown/CMakeLists.txt b/base/applications/shutdown/CMakeLists.txt index a3d99be1eb3..e14fe1196c8 100644 --- a/base/applications/shutdown/CMakeLists.txt +++ b/base/applications/shutdown/CMakeLists.txt @@ -11,4 +11,4 @@ add_pch(shutdown ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) set_module_type(shutdown win32cui) add_importlibs(shutdown advapi32 user32 msvcrt kernel32) -add_livecd_target(shutdown reactos/system32) \ No newline at end of file +add_cab_target(shutdown 1) \ No newline at end of file diff --git a/base/applications/winhlp32/CMakeLists.txt b/base/applications/winhlp32/CMakeLists.txt index bcf57b3f097..76b82883b1e 100644 --- a/base/applications/winhlp32/CMakeLists.txt +++ b/base/applications/winhlp32/CMakeLists.txt @@ -20,4 +20,4 @@ set_module_type(winhlp32 win32gui) target_link_libraries(winhlp32 wine) add_importlibs(winhlp32 user32 gdi32 shell32 comctl32 comdlg32 msvcrt kernel32 ntdll) -add_livecd_target(winhlp32 reactos) \ No newline at end of file +add_cab_target(winhlp32 4) \ No newline at end of file diff --git a/base/services/audiosrv/CMakeLists.txt b/base/services/audiosrv/CMakeLists.txt index 21c961e8ac4..6719c9b182b 100644 --- a/base/services/audiosrv/CMakeLists.txt +++ b/base/services/audiosrv/CMakeLists.txt @@ -12,4 +12,4 @@ add_executable(audiosrv set_module_type(audiosrv win32cui) add_importlibs(audiosrv advapi32 user32 setupapi msvcrt kernel32) -add_livecd_target(audiosrv reactos/system32) \ No newline at end of file +add_cab_target(audiosrv 1) \ No newline at end of file diff --git a/base/services/eventlog/CMakeLists.txt b/base/services/eventlog/CMakeLists.txt index 8035ae06e0e..b87033d5b07 100644 --- a/base/services/eventlog/CMakeLists.txt +++ b/base/services/eventlog/CMakeLists.txt @@ -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_livecd_target(eventlog reactos/system32) \ No newline at end of file +add_cab_target(eventlog 1) \ No newline at end of file diff --git a/base/services/rpcss/CMakeLists.txt b/base/services/rpcss/CMakeLists.txt index a2b964d11c5..89d1d3f3fa2 100644 --- a/base/services/rpcss/CMakeLists.txt +++ b/base/services/rpcss/CMakeLists.txt @@ -19,5 +19,5 @@ target_link_libraries(rpcss epm_server irot_server pseh wine) set_module_type(rpcss win32cui) add_importlibs(rpcss advapi32 rpcrt4 msvcrt kernel32 ntdll) -add_livecd_target(rpcss reactos/system32) +add_cab_target(rpcss 1) add_dependencies(rpcss winesdk) \ No newline at end of file diff --git a/base/services/spoolsv/CMakeLists.txt b/base/services/spoolsv/CMakeLists.txt index 1ad02962097..3e764b523df 100644 --- a/base/services/spoolsv/CMakeLists.txt +++ b/base/services/spoolsv/CMakeLists.txt @@ -7,4 +7,4 @@ target_link_libraries(spoolsv wine) set_module_type(spoolsv win32cui) add_importlibs(spoolsv advapi32 msvcrt kernel32 ntdll) -add_livecd_target(spoolsv reactos/system32) \ No newline at end of file +add_cab_target(spoolsv 1) \ No newline at end of file diff --git a/base/services/svchost/CMakeLists.txt b/base/services/svchost/CMakeLists.txt index ca71c019083..a4d6ecb45b6 100644 --- a/base/services/svchost/CMakeLists.txt +++ b/base/services/svchost/CMakeLists.txt @@ -3,4 +3,4 @@ add_executable(svchost svchost.c svchost.rc) set_module_type(svchost win32cui) add_importlibs(svchost advapi32 msvcrt kernel32 ntdll) -add_livecd_target(svchost reactos/system32) \ No newline at end of file +add_cab_target(svchost 1) \ No newline at end of file diff --git a/base/services/umpnpmgr/CMakeLists.txt b/base/services/umpnpmgr/CMakeLists.txt index ea440841cbb..b376f7c907b 100644 --- a/base/services/umpnpmgr/CMakeLists.txt +++ b/base/services/umpnpmgr/CMakeLists.txt @@ -17,4 +17,4 @@ add_importlibs(umpnpmgr kernel32 ntdll) -add_livecd_target(umpnpmgr reactos/system32) \ No newline at end of file +add_cab_target(umpnpmgr 1) \ No newline at end of file diff --git a/base/setup/setup/CMakeLists.txt b/base/setup/setup/CMakeLists.txt index c835380b8ec..a1d2a425145 100644 --- a/base/setup/setup/CMakeLists.txt +++ b/base/setup/setup/CMakeLists.txt @@ -5,4 +5,4 @@ add_executable(setup setup.c setup.rc) set_module_type(setup win32gui) add_importlibs(setup userenv msvcrt kernel32 ntdll) -add_livecd_target(setup reactos/system32) \ No newline at end of file +add_cab_target(setup 1) \ No newline at end of file diff --git a/base/shell/explorer/CMakeLists.txt b/base/shell/explorer/CMakeLists.txt index 9b913ae9c47..c482f6a2143 100644 --- a/base/shell/explorer/CMakeLists.txt +++ b/base/shell/explorer/CMakeLists.txt @@ -82,4 +82,4 @@ target_link_libraries(explorer set_image_base(explorer 0x00400000) add_dependencies(explorer psdk buildno_header) -add_livecd_target(explorer reactos) \ No newline at end of file +add_cab_target(explorer 4) \ No newline at end of file diff --git a/base/shell/explorer/notifyhook/CMakeLists.txt b/base/shell/explorer/notifyhook/CMakeLists.txt index 6042c0ba787..f869c364243 100644 --- a/base/shell/explorer/notifyhook/CMakeLists.txt +++ b/base/shell/explorer/notifyhook/CMakeLists.txt @@ -9,4 +9,4 @@ target_link_libraries(notifyhook -lkernel32 -luser32) -add_livecd_target(notifyhook reactos/system32) \ No newline at end of file +add_cab_target(notifyhook 1) \ No newline at end of file diff --git a/base/system/autochk/CMakeLists.txt b/base/system/autochk/CMakeLists.txt index 3feaa2166a0..4221d9e103f 100644 --- a/base/system/autochk/CMakeLists.txt +++ b/base/system/autochk/CMakeLists.txt @@ -5,4 +5,4 @@ set_module_type(autochk nativecui) target_link_libraries(autochk mingw_common nt) add_importlibs(autochk kernel32 ntdll) -add_livecd_target(autochk reactos/system32) \ No newline at end of file +add_cab_target(autochk 1) \ No newline at end of file diff --git a/base/system/lsass/CMakeLists.txt b/base/system/lsass/CMakeLists.txt index 5f90c38313e..86e6661c2c9 100644 --- a/base/system/lsass/CMakeLists.txt +++ b/base/system/lsass/CMakeLists.txt @@ -8,4 +8,4 @@ add_executable(lsass lsass.c lsass.rc) set_module_type(lsass win32gui) add_importlibs(lsass advapi32 lsasrv msvcrt kernel32 ntdll) -add_livecd_target(lsass reactos/system32) \ No newline at end of file +add_cab_target(lsass 1) \ No newline at end of file diff --git a/base/system/rundll32/CMakeLists.txt b/base/system/rundll32/CMakeLists.txt index 1566f6ba31c..4cac137df0d 100644 --- a/base/system/rundll32/CMakeLists.txt +++ b/base/system/rundll32/CMakeLists.txt @@ -8,4 +8,4 @@ add_executable(rundll32 rundll32.c rundll32.rc) set_module_type(rundll32 win32gui) add_importlibs(rundll32 user32 msvcrt kernel32 ntdll) -add_livecd_target(rundll32 reactos/system32) \ No newline at end of file +add_cab_target(rundll32 1) \ No newline at end of file diff --git a/base/system/services/CMakeLists.txt b/base/system/services/CMakeLists.txt index 55daf53846c..74be5ef1a51 100644 --- a/base/system/services/CMakeLists.txt +++ b/base/system/services/CMakeLists.txt @@ -23,4 +23,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_livecd_target(services reactos/system32) \ No newline at end of file +add_cab_target(services 1) \ No newline at end of file diff --git a/base/system/smss/CMakeLists.txt b/base/system/smss/CMakeLists.txt index a6b1c9c2c2e..3fd548a74b9 100644 --- a/base/system/smss/CMakeLists.txt +++ b/base/system/smss/CMakeLists.txt @@ -30,4 +30,4 @@ add_pch(smss ${CMAKE_CURRENT_SOURCE_DIR}/smss.h ${SOURCE}) set_module_type(smss nativecui) add_importlibs(smss ntdll) -add_livecd_target(smss reactos/system32) \ No newline at end of file +add_cab_target(smss 1) \ No newline at end of file diff --git a/base/system/userinit/CMakeLists.txt b/base/system/userinit/CMakeLists.txt index 79049405766..66bd8f9a30f 100644 --- a/base/system/userinit/CMakeLists.txt +++ b/base/system/userinit/CMakeLists.txt @@ -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_livecd_target(userinit reactos/system32) +add_cab_target(userinit 1) diff --git a/base/system/winlogon/CMakeLists.txt b/base/system/winlogon/CMakeLists.txt index 1568d14fe7b..cbeb46e5729 100644 --- a/base/system/winlogon/CMakeLists.txt +++ b/base/system/winlogon/CMakeLists.txt @@ -17,4 +17,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_livecd_target(winlogon reactos/system32) \ No newline at end of file +add_cab_target(winlogon 1) \ No newline at end of file diff --git a/boot/CMakeLists.txt b/boot/CMakeLists.txt index c6d98131d42..040629327d9 100644 --- a/boot/CMakeLists.txt +++ b/boot/CMakeLists.txt @@ -205,24 +205,28 @@ target_link_libraries(setupldr cmlib rtl libcntpr) - -list(APPEND LIVECD_HIVES - ${CMAKE_CURRENT_SOURCE_DIR}/bootdata/livecd.inf - ${CMAKE_CURRENT_SOURCE_DIR}/bootdata/hiveinst_i386.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) - -add_custom_target(livecd_hives DEPENDS ${LIVECD_DIR}/reactos/system32/config/sam) - + # Bootcd files add_minicd_target(setupldr loader setupldr.sys) add_minicd_target(freeldr loader freeldr.sys) 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) # 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) + +add_custom_target(livecd_hives DEPENDS ${LIVECD_DIR}/reactos/system32/config/sam) + add_livecd_target(setupldr loader) -add_dependencies(livecd livecd_hives isoboot) \ No newline at end of file +add_livecd(${REACTOS_SOURCE_DIR}/boot/bootdata/livecd.ini "" freeldr.ini) \ No newline at end of file diff --git a/dll/cpl/access/CMakeLists.txt b/dll/cpl/access/CMakeLists.txt index 03f75a604cb..71301dbbf42 100644 --- a/dll/cpl/access/CMakeLists.txt +++ b/dll/cpl/access/CMakeLists.txt @@ -25,4 +25,4 @@ add_importlibs(access kernel32) add_dependencies(access access_def) -add_livecd_target(access reactos/system32) +add_cab_target(access 1) diff --git a/dll/cpl/appwiz/CMakeLists.txt b/dll/cpl/appwiz/CMakeLists.txt index 9f83a92ea7a..e617fb2d264 100644 --- a/dll/cpl/appwiz/CMakeLists.txt +++ b/dll/cpl/appwiz/CMakeLists.txt @@ -22,4 +22,4 @@ add_importlibs(appwiz kernel32) add_dependencies(appwiz appwiz_def) -add_livecd_target(appwiz reactos/system32) +add_cab_target(appwiz 1) diff --git a/dll/cpl/console/CMakeLists.txt b/dll/cpl/console/CMakeLists.txt index d341d904dca..9873433d1c6 100644 --- a/dll/cpl/console/CMakeLists.txt +++ b/dll/cpl/console/CMakeLists.txt @@ -26,4 +26,4 @@ add_importlibs(console add_pch(console ${CMAKE_CURRENT_SOURCE_DIR}/console.h ${SOURCE}) add_dependencies(console console_def) -add_livecd_target(console reactos/system32) +add_cab_target(console 1) diff --git a/dll/cpl/desk/CMakeLists.txt b/dll/cpl/desk/CMakeLists.txt index 78fcca43278..a8eb3fe7b6d 100644 --- a/dll/cpl/desk/CMakeLists.txt +++ b/dll/cpl/desk/CMakeLists.txt @@ -45,4 +45,4 @@ add_importlibs(desk ntdll) add_dependencies(desk desk_def) -add_livecd_target(desk reactos/system32) +add_cab_target(desk 1) diff --git a/dll/cpl/hdwwiz/CMakeLists.txt b/dll/cpl/hdwwiz/CMakeLists.txt index c3fbdfb9d04..1a192213cf2 100644 --- a/dll/cpl/hdwwiz/CMakeLists.txt +++ b/dll/cpl/hdwwiz/CMakeLists.txt @@ -22,4 +22,4 @@ add_importlibs(hdwwiz ntdll) add_dependencies(hdwwiz hdwwiz_def) -add_livecd_target(hdwwiz reactos/system32) +add_cab_target(hdwwiz 1) diff --git a/dll/cpl/input/CMakeLists.txt b/dll/cpl/input/CMakeLists.txt index 6bbfa47b5b7..3f33744e3d4 100644 --- a/dll/cpl/input/CMakeLists.txt +++ b/dll/cpl/input/CMakeLists.txt @@ -24,4 +24,4 @@ add_importlibs(input kernel32) add_dependencies(input input_def) -add_livecd_target(input reactos/system32) +add_cab_target(input 1) diff --git a/dll/cpl/intl/CMakeLists.txt b/dll/cpl/intl/CMakeLists.txt index bdb8603afce..9a0d0f1f8b3 100644 --- a/dll/cpl/intl/CMakeLists.txt +++ b/dll/cpl/intl/CMakeLists.txt @@ -34,4 +34,4 @@ add_importlibs(intl kernel32) add_dependencies(intl intl_def) -add_livecd_target(intl reactos/system32) +add_cab_target(intl 1) diff --git a/dll/cpl/joy/CMakeLists.txt b/dll/cpl/joy/CMakeLists.txt index de64c73fdfd..bc5015faa43 100644 --- a/dll/cpl/joy/CMakeLists.txt +++ b/dll/cpl/joy/CMakeLists.txt @@ -16,4 +16,4 @@ add_importlibs(joy shell32) add_dependencies(joy joy_def) -add_livecd_target(joy reactos/system32) +add_cab_target(joy 1) diff --git a/dll/cpl/main/CMakeLists.txt b/dll/cpl/main/CMakeLists.txt index 0ae0a629d92..ac169e6069f 100644 --- a/dll/cpl/main/CMakeLists.txt +++ b/dll/cpl/main/CMakeLists.txt @@ -27,4 +27,4 @@ add_importlibs(main kernel32) add_dependencies(main main_def) -add_livecd_target(main reactos/system32) +add_cab_target(main 1) diff --git a/dll/cpl/mmsys/CMakeLists.txt b/dll/cpl/mmsys/CMakeLists.txt index 0063f799f54..6e912f8aed9 100644 --- a/dll/cpl/mmsys/CMakeLists.txt +++ b/dll/cpl/mmsys/CMakeLists.txt @@ -32,4 +32,4 @@ add_importlibs(mmsys kernel32) add_dependencies(mmsys mmsys_def) -add_livecd_target(mmsys reactos/system32) +add_cab_target(mmsys 1) diff --git a/dll/cpl/ncpa/CMakeLists.txt b/dll/cpl/ncpa/CMakeLists.txt index 9fb7fa24bf4..86a31002e31 100644 --- a/dll/cpl/ncpa/CMakeLists.txt +++ b/dll/cpl/ncpa/CMakeLists.txt @@ -15,4 +15,4 @@ add_importlibs(ncpa shell32) add_dependencies(ncpa ncpa_def) -add_livecd_target(ncpa reactos/system32) +add_cab_target(ncpa 1) diff --git a/dll/cpl/odbccp32/CMakeLists.txt b/dll/cpl/odbccp32/CMakeLists.txt index fa64e9c79e1..d4822591a19 100644 --- a/dll/cpl/odbccp32/CMakeLists.txt +++ b/dll/cpl/odbccp32/CMakeLists.txt @@ -11,4 +11,4 @@ target_link_libraries(odbccp32i ${CMAKE_CURRENT_BINARY_DIR}/odbccp32.def) add_importlibs(odbccp32i user32 comctl32 kernel32) add_dependencies(odbccp32i odbccp32i_def) -add_livecd_target(odbccp32i reactos/system32) +add_cab_target(odbccp32i 1) diff --git a/dll/cpl/powercfg/CMakeLists.txt b/dll/cpl/powercfg/CMakeLists.txt index c7a176672a7..e438ad7359e 100644 --- a/dll/cpl/powercfg/CMakeLists.txt +++ b/dll/cpl/powercfg/CMakeLists.txt @@ -26,4 +26,4 @@ add_importlibs(powercfg kernel32) add_dependencies(powercfg powercfg_def) -add_livecd_target(powercfg reactos/system32) +add_cab_target(powercfg 1) diff --git a/dll/cpl/sysdm/CMakeLists.txt b/dll/cpl/sysdm/CMakeLists.txt index 200ca691ab2..8634478cae8 100644 --- a/dll/cpl/sysdm/CMakeLists.txt +++ b/dll/cpl/sysdm/CMakeLists.txt @@ -38,4 +38,4 @@ add_importlibs(sysdm add_pch(sysdm ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) add_dependencies(sysdm sysdm_def) -add_livecd_target(sysdm reactos/system32) +add_cab_target(sysdm 1) diff --git a/dll/cpl/telephon/CMakeLists.txt b/dll/cpl/telephon/CMakeLists.txt index bc7c9e4eaa0..d04b2d883db 100644 --- a/dll/cpl/telephon/CMakeLists.txt +++ b/dll/cpl/telephon/CMakeLists.txt @@ -18,4 +18,4 @@ add_importlibs(telephon kernel32) add_dependencies(telephon telephon_def) -add_livecd_target(telephon reactos/system32) +add_cab_target(telephon 1) diff --git a/dll/cpl/timedate/CMakeLists.txt b/dll/cpl/timedate/CMakeLists.txt index e82bcce93cb..57caf37b405 100644 --- a/dll/cpl/timedate/CMakeLists.txt +++ b/dll/cpl/timedate/CMakeLists.txt @@ -28,4 +28,4 @@ add_importlibs(timedate kernel32) add_dependencies(timedate timedate_def) -add_livecd_target(timedate reactos/system32) +add_cab_target(timedate 1) diff --git a/dll/cpl/usrmgr/CMakeLists.txt b/dll/cpl/usrmgr/CMakeLists.txt index e2f2c5209ee..7889ed1bf9d 100644 --- a/dll/cpl/usrmgr/CMakeLists.txt +++ b/dll/cpl/usrmgr/CMakeLists.txt @@ -30,4 +30,4 @@ add_importlibs(usrmgr ntdll) add_dependencies(usrmgr usrmgr_def) -add_livecd_target(usrmgr reactos/system32) +add_cab_target(usrmgr 1) diff --git a/dll/directx/amstream/CMakeLists.txt b/dll/directx/amstream/CMakeLists.txt index 287fa573e4a..079efd0e234 100644 --- a/dll/directx/amstream/CMakeLists.txt +++ b/dll/directx/amstream/CMakeLists.txt @@ -30,4 +30,4 @@ add_importlibs(amstream ntdll) add_dependencies(amstream amstream_def dxsdk) -add_livecd_target(amstream reactos/system32) +add_cab_target(amstream 1) diff --git a/dll/directx/devenum/CMakeLists.txt b/dll/directx/devenum/CMakeLists.txt index 253c9b1abb1..4e0a7a1bf17 100644 --- a/dll/directx/devenum/CMakeLists.txt +++ b/dll/directx/devenum/CMakeLists.txt @@ -34,4 +34,4 @@ add_importlibs(devenum ntdll) add_dependencies(devenum devenum_def) -add_livecd_target(devenum reactos/system32) +add_cab_target(devenum 1) diff --git a/dll/directx/dinput/CMakeLists.txt b/dll/directx/dinput/CMakeLists.txt index 2899bec544b..26a3461403f 100644 --- a/dll/directx/dinput/CMakeLists.txt +++ b/dll/directx/dinput/CMakeLists.txt @@ -36,4 +36,4 @@ add_importlibs(dinput ntdll) add_dependencies(dinput dinput_def) -add_livecd_target(dinput reactos/system32) +add_cab_target(dinput 1) diff --git a/dll/directx/dsound/CMakeLists.txt b/dll/directx/dsound/CMakeLists.txt index 900bd586d87..f908ec49938 100644 --- a/dll/directx/dsound/CMakeLists.txt +++ b/dll/directx/dsound/CMakeLists.txt @@ -37,4 +37,4 @@ add_importlibs(dsound ntdll) add_dependencies(dsound dsound_def) -add_livecd_target(dsound reactos/system32) +add_cab_target(dsound 1) diff --git a/dll/directx/dxdiagn/CMakeLists.txt b/dll/directx/dxdiagn/CMakeLists.txt index 2309660cfb4..e927a4c9e85 100644 --- a/dll/directx/dxdiagn/CMakeLists.txt +++ b/dll/directx/dxdiagn/CMakeLists.txt @@ -27,4 +27,4 @@ add_importlibs(dxdiagn ntdll) add_dependencies(dxdiagn dxdiagn_def) -add_livecd_target(dxdiagn reactos/system32) +add_cab_target(dxdiagn 1) diff --git a/dll/directx/ksuser/CMakeLists.txt b/dll/directx/ksuser/CMakeLists.txt index fc6196f2ef8..901368b5faf 100644 --- a/dll/directx/ksuser/CMakeLists.txt +++ b/dll/directx/ksuser/CMakeLists.txt @@ -9,4 +9,4 @@ target_link_libraries(ksuser ${CMAKE_CURRENT_BINARY_DIR}/ksuser.def) add_importlibs(ksuser advapi32 kernel32 ntdll) add_dependencies(ksuser ksuser_def psdk bugcodes) -add_livecd_target(ksuser reactos/system32) +add_cab_target(ksuser 1) diff --git a/dll/directx/qedit/CMakeLists.txt b/dll/directx/qedit/CMakeLists.txt index 6309e60dc04..d81456d92d7 100644 --- a/dll/directx/qedit/CMakeLists.txt +++ b/dll/directx/qedit/CMakeLists.txt @@ -32,4 +32,4 @@ add_importlibs(qedit ntdll) add_dependencies(qedit qedit_def dxsdk) -add_livecd_target(qedit reactos/system32) +add_cab_target(qedit 1) diff --git a/dll/directx/quartz/CMakeLists.txt b/dll/directx/quartz/CMakeLists.txt index 77dea3175df..81e72f9d7d2 100644 --- a/dll/directx/quartz/CMakeLists.txt +++ b/dll/directx/quartz/CMakeLists.txt @@ -69,4 +69,4 @@ add_importlibs(quartz add_dependencies(quartz quartz_def) rpcproxy(quartz quartz_strmif.idl) -add_livecd_target(quartz reactos/system32) +add_cab_target(quartz 1) diff --git a/dll/directx/wine/d3d8/CMakeLists.txt b/dll/directx/wine/d3d8/CMakeLists.txt index aa3bcd9f014..cc339c4d399 100644 --- a/dll/directx/wine/d3d8/CMakeLists.txt +++ b/dll/directx/wine/d3d8/CMakeLists.txt @@ -38,4 +38,4 @@ add_importlibs(d3d8 wined3d) add_dependencies(d3d8 d3d8_def wineheaders) -add_livecd_target(d3d8 reactos/system32) +add_cab_target(d3d8 1) diff --git a/dll/directx/wine/d3d9/CMakeLists.txt b/dll/directx/wine/d3d9/CMakeLists.txt index 0752a354bfd..e87ed9b3b0b 100644 --- a/dll/directx/wine/d3d9/CMakeLists.txt +++ b/dll/directx/wine/d3d9/CMakeLists.txt @@ -40,4 +40,4 @@ add_importlibs(d3d9 wined3d) add_dependencies(d3d9 d3d9_def wineheaders) -add_livecd_target(d3d9 reactos/system32) +add_cab_target(d3d9 1) diff --git a/dll/keyboard/kbdus/CMakeLists.txt b/dll/keyboard/kbdus/CMakeLists.txt index f7ab64a2030..624b2b97895 100644 --- a/dll/keyboard/kbdus/CMakeLists.txt +++ b/dll/keyboard/kbdus/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbdus 0) target_link_libraries(kbdus ${CMAKE_CURRENT_BINARY_DIR}/kbdus.def) add_dependencies(kbdus kbdus_def psdk buildno_header) -add_livecd_target(kbdus reactos/system32) \ No newline at end of file +add_cab_target(kbdus 1) \ No newline at end of file diff --git a/dll/shellext/deskadp/CMakeLists.txt b/dll/shellext/deskadp/CMakeLists.txt index 8a6ee6e0399..d8c33009cd0 100644 --- a/dll/shellext/deskadp/CMakeLists.txt +++ b/dll/shellext/deskadp/CMakeLists.txt @@ -24,4 +24,4 @@ add_importlibs(deskadp add_pch(deskadp ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) add_dependencies(deskadp deskadp_def) -add_livecd_target(deskadp reactos/system32) +add_cab_target(deskadp 1) diff --git a/dll/shellext/deskmon/CMakeLists.txt b/dll/shellext/deskmon/CMakeLists.txt index c4d555b6c9c..a78832ad9f9 100644 --- a/dll/shellext/deskmon/CMakeLists.txt +++ b/dll/shellext/deskmon/CMakeLists.txt @@ -24,4 +24,4 @@ add_importlibs(deskmon add_pch(deskmon ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) add_dependencies(deskmon deskmon_def) -add_livecd_target(deskmon reactos/system32) +add_cab_target(deskmon 1) diff --git a/dll/shellext/devcpux/CMakeLists.txt b/dll/shellext/devcpux/CMakeLists.txt index 8f77431d737..7a5e61ac76b 100644 --- a/dll/shellext/devcpux/CMakeLists.txt +++ b/dll/shellext/devcpux/CMakeLists.txt @@ -17,4 +17,4 @@ add_importlibs(devcpux ntdll) add_dependencies(devcpux devcpux_def) -add_livecd_target(devcpux reactos/system32) +add_cab_target(devcpux 1) diff --git a/dll/shellext/fontext/CMakeLists.txt b/dll/shellext/fontext/CMakeLists.txt index 950b39cdf20..9dff1dac632 100644 --- a/dll/shellext/fontext/CMakeLists.txt +++ b/dll/shellext/fontext/CMakeLists.txt @@ -24,4 +24,4 @@ add_importlibs(fontext ntdll) add_dependencies(fontext fontext_def) -add_livecd_target(fontext reactos/system32) +add_cab_target(fontext 1) diff --git a/dll/shellext/slayer/CMakeLists.txt b/dll/shellext/slayer/CMakeLists.txt index feeda200d5f..ccd37171d78 100644 --- a/dll/shellext/slayer/CMakeLists.txt +++ b/dll/shellext/slayer/CMakeLists.txt @@ -22,4 +22,4 @@ add_importlibs(slayer add_pch(slayer ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) add_dependencies(slayer slayer_def) -add_livecd_target(slayer reactos/system32) +add_cab_target(slayer 1) diff --git a/dll/win32/acledit/CMakeLists.txt b/dll/win32/acledit/CMakeLists.txt index 26d75b3a5c8..8b4b42b8e08 100644 --- a/dll/win32/acledit/CMakeLists.txt +++ b/dll/win32/acledit/CMakeLists.txt @@ -16,4 +16,4 @@ target_link_libraries(acledit ${CMAKE_CURRENT_BINARY_DIR}/acledit.def) add_importlibs(acledit ntdll) add_dependencies(acledit acledit_def) -add_livecd_target(acledit reactos/system32) +add_cab_target(acledit 1) diff --git a/dll/win32/aclui/CMakeLists.txt b/dll/win32/aclui/CMakeLists.txt index d6421693803..26309ee4f56 100644 --- a/dll/win32/aclui/CMakeLists.txt +++ b/dll/win32/aclui/CMakeLists.txt @@ -24,4 +24,4 @@ add_importlibs(aclui user32 gdi32 comctl32 ole32 oleaut32 advapi32 uxtheme kerne add_pch(aclui ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) add_dependencies(aclui aclui_def) -add_livecd_target(aclui reactos/system32) +add_cab_target(aclui 1) diff --git a/dll/win32/activeds/CMakeLists.txt b/dll/win32/activeds/CMakeLists.txt index d227e9cafa0..a63561fcf4c 100644 --- a/dll/win32/activeds/CMakeLists.txt +++ b/dll/win32/activeds/CMakeLists.txt @@ -16,4 +16,4 @@ target_link_libraries(activeds add_importlibs(activeds kernel32 ntdll) add_dependencies(activeds activeds_def) -add_livecd_target(activeds reactos/system32) +add_cab_target(activeds 1) diff --git a/dll/win32/actxprxy/CMakeLists.txt b/dll/win32/actxprxy/CMakeLists.txt index 20a8a2fe16c..d7018e28335 100644 --- a/dll/win32/actxprxy/CMakeLists.txt +++ b/dll/win32/actxprxy/CMakeLists.txt @@ -39,4 +39,4 @@ rpcproxy(actxprxy actxprxy_shobjidl.idl actxprxy_urlhist.idl) -add_livecd_target(actxprxy reactos/system32) +add_cab_target(actxprxy 1) diff --git a/dll/win32/advapi32/CMakeLists.txt b/dll/win32/advapi32/CMakeLists.txt index d6e25b0e9f9..9c0c3e21863 100644 --- a/dll/win32/advapi32/CMakeLists.txt +++ b/dll/win32/advapi32/CMakeLists.txt @@ -59,4 +59,4 @@ target_link_libraries(advapi32 add_importlibs(advapi32 rpcrt4 kernel32 ntdll) add_pch(advapi32 ${CMAKE_CURRENT_SOURCE_DIR}/advapi32.h ${SOURCE}) -add_livecd_target(advapi32 reactos/system32) +add_cab_target(advapi32 1) diff --git a/dll/win32/advpack/CMakeLists.txt b/dll/win32/advpack/CMakeLists.txt index ddbf38d6980..1e56bac5284 100644 --- a/dll/win32/advpack/CMakeLists.txt +++ b/dll/win32/advpack/CMakeLists.txt @@ -21,4 +21,4 @@ target_link_libraries(advpack add_importlibs(advpack ole32 setupapi version advapi32 kernel32 ntdll) add_dependencies(advpack advpack_def) -add_livecd_target(advpack reactos/system32) +add_cab_target(advpack 1) diff --git a/dll/win32/atl/CMakeLists.txt b/dll/win32/atl/CMakeLists.txt index 5507578902b..c684803195f 100644 --- a/dll/win32/atl/CMakeLists.txt +++ b/dll/win32/atl/CMakeLists.txt @@ -34,4 +34,4 @@ add_importlibs(atl ntdll) add_dependencies(atl atl_atliface_header atl_def) -add_livecd_target(atl reactos/system32) +add_cab_target(atl 1) diff --git a/dll/win32/authz/CMakeLists.txt b/dll/win32/authz/CMakeLists.txt index 0505643a8df..d1530a8d7cc 100644 --- a/dll/win32/authz/CMakeLists.txt +++ b/dll/win32/authz/CMakeLists.txt @@ -20,4 +20,4 @@ target_link_libraries(authz ${CMAKE_CURRENT_BINARY_DIR}/authz.def) add_pch(authz ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) add_importlibs(authz advapi32 kernel32 ntdll) add_dependencies(authz authz_def) -add_livecd_target(authz reactos/system32) +add_cab_target(authz 1) diff --git a/dll/win32/avicap32/CMakeLists.txt b/dll/win32/avicap32/CMakeLists.txt index bef0a501af8..47e4fee4c90 100644 --- a/dll/win32/avicap32/CMakeLists.txt +++ b/dll/win32/avicap32/CMakeLists.txt @@ -13,4 +13,4 @@ target_link_libraries(avicap32 add_importlibs(avicap32 advapi32 user32 version kernel32 ntdll) add_dependencies(avicap32 avicap32_def) -add_livecd_target(avicap32 reactos/system32) +add_cab_target(avicap32 1) diff --git a/dll/win32/avifil32/CMakeLists.txt b/dll/win32/avifil32/CMakeLists.txt index c9c16a852ca..1bb273ae81f 100644 --- a/dll/win32/avifil32/CMakeLists.txt +++ b/dll/win32/avifil32/CMakeLists.txt @@ -40,4 +40,4 @@ add_importlibs(avifil32 ntdll) add_dependencies(avifil32 avifil32_def) -add_livecd_target(avifil32 reactos/system32) +add_cab_target(avifil32 1) diff --git a/dll/win32/batt/CMakeLists.txt b/dll/win32/batt/CMakeLists.txt index 8dcec8b04e1..417820c74d1 100644 --- a/dll/win32/batt/CMakeLists.txt +++ b/dll/win32/batt/CMakeLists.txt @@ -11,4 +11,4 @@ target_link_libraries(batt ${CMAKE_CURRENT_BINARY_DIR}/batt.def) add_importlibs(batt kernel32) add_dependencies(batt batt_def) -add_livecd_target(batt reactos/system32) +add_cab_target(batt 1) diff --git a/dll/win32/bcrypt/CMakeLists.txt b/dll/win32/bcrypt/CMakeLists.txt index fec7b3aa5d7..17e157bdb26 100644 --- a/dll/win32/bcrypt/CMakeLists.txt +++ b/dll/win32/bcrypt/CMakeLists.txt @@ -17,4 +17,4 @@ target_link_libraries(bcrypt add_importlibs(bcrypt kernel32 ntdll) add_dependencies(bcrypt bcrypt_def) -add_livecd_target(bcrypt reactos/system32) +add_cab_target(bcrypt 1) diff --git a/dll/win32/beepmidi/CMakeLists.txt b/dll/win32/beepmidi/CMakeLists.txt index 5042bfb2a6d..12313d2bd8a 100644 --- a/dll/win32/beepmidi/CMakeLists.txt +++ b/dll/win32/beepmidi/CMakeLists.txt @@ -11,4 +11,4 @@ target_link_libraries(beepmidi ${CMAKE_CURRENT_BINARY_DIR}/beepmidi.def) add_importlibs(beepmidi winmm kernel32 ntdll) add_dependencies(beepmidi beepmidi_def psdk) -add_livecd_target(beepmidi reactos/system32) \ No newline at end of file +add_cab_target(beepmidi 1) \ No newline at end of file diff --git a/dll/win32/browseui/CMakeLists.txt b/dll/win32/browseui/CMakeLists.txt index 72bfc3540bf..0ed25976948 100644 --- a/dll/win32/browseui/CMakeLists.txt +++ b/dll/win32/browseui/CMakeLists.txt @@ -52,4 +52,4 @@ add_importlibs(browseui ntdll) add_dependencies(browseui browseui_def) -add_livecd_target(browseui reactos/system32) +add_cab_target(browseui 1) diff --git a/dll/win32/cabinet/CMakeLists.txt b/dll/win32/cabinet/CMakeLists.txt index 430650506dd..205c6ba2f5a 100644 --- a/dll/win32/cabinet/CMakeLists.txt +++ b/dll/win32/cabinet/CMakeLists.txt @@ -21,4 +21,4 @@ target_link_libraries(cabinet add_importlibs(cabinet kernel32 ntdll) add_dependencies(cabinet cabinet_def psdk buildno_header) -add_livecd_target(cabinet reactos/system32) \ No newline at end of file +add_cab_target(cabinet 1) \ No newline at end of file diff --git a/dll/win32/cards/CMakeLists.txt b/dll/win32/cards/CMakeLists.txt index bfad4cf3c70..f56cc592485 100644 --- a/dll/win32/cards/CMakeLists.txt +++ b/dll/win32/cards/CMakeLists.txt @@ -14,4 +14,4 @@ target_link_libraries(cards ${CMAKE_CURRENT_BINARY_DIR}/cards.def) add_importlibs(cards user32 gdi32) add_dependencies(cards cards_def) -add_livecd_target(cards reactos/system32) +add_cab_target(cards 1) diff --git a/dll/win32/cfgmgr32/CMakeLists.txt b/dll/win32/cfgmgr32/CMakeLists.txt index 63321880fe7..64af9c0d852 100644 --- a/dll/win32/cfgmgr32/CMakeLists.txt +++ b/dll/win32/cfgmgr32/CMakeLists.txt @@ -8,4 +8,4 @@ set_entrypoint(cfgmgr32 0) target_link_libraries(cfgmgr32 ${CMAKE_CURRENT_BINARY_DIR}/cfgmgr32.def) add_dependencies(cfgmgr32 cfgmgr32_def psdk buildno_header) -add_livecd_target(cfgmgr32 reactos/system32) +add_cab_target(cfgmgr32 1) diff --git a/dll/win32/clusapi/CMakeLists.txt b/dll/win32/clusapi/CMakeLists.txt index 4795dbc9763..48560c31a55 100644 --- a/dll/win32/clusapi/CMakeLists.txt +++ b/dll/win32/clusapi/CMakeLists.txt @@ -15,4 +15,4 @@ target_link_libraries(clusapi add_importlibs(clusapi kernel32 ntdll) add_dependencies(clusapi clusapi_def) -add_livecd_target(clusapi reactos/system32) +add_cab_target(clusapi 1) diff --git a/dll/win32/comcat/CMakeLists.txt b/dll/win32/comcat/CMakeLists.txt index 3cd4f8974e6..8ca91a08bf7 100644 --- a/dll/win32/comcat/CMakeLists.txt +++ b/dll/win32/comcat/CMakeLists.txt @@ -22,4 +22,4 @@ add_importlibs(comcat ntdll) add_dependencies(comcat comcat_def psdk buildno_header) -add_livecd_target(comcat reactos/system32) +add_cab_target(comcat 1) diff --git a/dll/win32/comctl32/CMakeLists.txt b/dll/win32/comctl32/CMakeLists.txt index 14f7337a9dd..19a998b1e9c 100644 --- a/dll/win32/comctl32/CMakeLists.txt +++ b/dll/win32/comctl32/CMakeLists.txt @@ -67,4 +67,4 @@ add_importlibs(comctl32 ntdll) add_dependencies(comctl32 comctl32_def) -add_livecd_target(comctl32 reactos/system32) +add_cab_target(comctl32 1) diff --git a/dll/win32/comdlg32/CMakeLists.txt b/dll/win32/comdlg32/CMakeLists.txt index d951be182b3..7e540db91ce 100644 --- a/dll/win32/comdlg32/CMakeLists.txt +++ b/dll/win32/comdlg32/CMakeLists.txt @@ -38,4 +38,4 @@ add_importlibs(comdlg32 ntdll) add_dependencies(comdlg32 comdlg32_def) -add_livecd_target(comdlg32 reactos/system32) +add_cab_target(comdlg32 1) diff --git a/dll/win32/compstui/CMakeLists.txt b/dll/win32/compstui/CMakeLists.txt index f6e8ae89010..3053b3ea27d 100644 --- a/dll/win32/compstui/CMakeLists.txt +++ b/dll/win32/compstui/CMakeLists.txt @@ -15,4 +15,4 @@ target_link_libraries(compstui add_importlibs(compstui kernel32 ntdll) add_dependencies(compstui compstui_def) -add_livecd_target(compstui reactos/system32) +add_cab_target(compstui 1) diff --git a/dll/win32/credui/CMakeLists.txt b/dll/win32/credui/CMakeLists.txt index 9616413aae3..21064dfd100 100644 --- a/dll/win32/credui/CMakeLists.txt +++ b/dll/win32/credui/CMakeLists.txt @@ -15,4 +15,4 @@ target_link_libraries(credui add_importlibs(credui advapi32 user32 comctl32 kernel32 ntdll) add_dependencies(credui credui_def) -add_livecd_target(credui reactos/system32) +add_cab_target(credui 1) diff --git a/dll/win32/crtdll/CMakeLists.txt b/dll/win32/crtdll/CMakeLists.txt index a09786490b3..6c5688e381d 100644 --- a/dll/win32/crtdll/CMakeLists.txt +++ b/dll/win32/crtdll/CMakeLists.txt @@ -28,4 +28,4 @@ target_link_libraries(crtdll add_importlibs(crtdll kernel32 ntdll) add_pch(crtdll ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) add_dependencies(crtdll crtdll_def) -add_livecd_target(crtdll reactos/system32) +add_cab_target(crtdll 1) diff --git a/dll/win32/crypt32/CMakeLists.txt b/dll/win32/crypt32/CMakeLists.txt index 3b0c4cf232a..10be792aaa6 100644 --- a/dll/win32/crypt32/CMakeLists.txt +++ b/dll/win32/crypt32/CMakeLists.txt @@ -50,4 +50,4 @@ target_link_libraries(crypt32 add_importlibs(crypt32 user32 advapi32 msvcrt kernel32 ntdll) add_dependencies(crypt32 crypt32_def) -add_livecd_target(crypt32 reactos/system32) +add_cab_target(crypt32 1) diff --git a/dll/win32/cryptdlg/CMakeLists.txt b/dll/win32/cryptdlg/CMakeLists.txt index 3ac2f9969be..2bd985a39b0 100644 --- a/dll/win32/cryptdlg/CMakeLists.txt +++ b/dll/win32/cryptdlg/CMakeLists.txt @@ -22,4 +22,4 @@ add_importlibs(cryptdlg ntdll) add_dependencies(cryptdlg cryptdlg_def) -add_livecd_target(cryptdlg reactos/system32) +add_cab_target(cryptdlg 1) diff --git a/dll/win32/cryptdll/CMakeLists.txt b/dll/win32/cryptdll/CMakeLists.txt index 1e814478077..357e420527b 100644 --- a/dll/win32/cryptdll/CMakeLists.txt +++ b/dll/win32/cryptdll/CMakeLists.txt @@ -15,4 +15,4 @@ target_link_libraries(cryptdll add_importlibs(cryptdll kernel32 ntdll) add_dependencies(cryptdll cryptdll_def) -add_livecd_target(cryptdll reactos/system32) +add_cab_target(cryptdll 1) diff --git a/dll/win32/cryptnet/CMakeLists.txt b/dll/win32/cryptnet/CMakeLists.txt index eeec16dd615..8a99887e3b4 100644 --- a/dll/win32/cryptnet/CMakeLists.txt +++ b/dll/win32/cryptnet/CMakeLists.txt @@ -19,4 +19,4 @@ add_importlibs(cryptnet ntdll) add_dependencies(cryptnet cryptnet_def) -add_livecd_target(cryptnet reactos/system32) +add_cab_target(cryptnet 1) diff --git a/dll/win32/cryptui/CMakeLists.txt b/dll/win32/cryptui/CMakeLists.txt index a332758f7b2..bfcb994a779 100644 --- a/dll/win32/cryptui/CMakeLists.txt +++ b/dll/win32/cryptui/CMakeLists.txt @@ -28,4 +28,4 @@ add_importlibs(cryptui ntdll) add_dependencies(cryptui cryptui_def) -add_livecd_target(cryptui reactos/system32) +add_cab_target(cryptui 1) diff --git a/dll/win32/dbghelp/CMakeLists.txt b/dll/win32/dbghelp/CMakeLists.txt index 244181eacd6..099da6a9f2d 100644 --- a/dll/win32/dbghelp/CMakeLists.txt +++ b/dll/win32/dbghelp/CMakeLists.txt @@ -51,4 +51,4 @@ target_link_libraries(dbghelp add_importlibs(dbghelp psapi version msvcrt kernel32 ntdll) add_dependencies(dbghelp dbghelp_def) -add_livecd_target(dbghelp reactos/system32) +add_cab_target(dbghelp 1) diff --git a/dll/win32/dciman32/CMakeLists.txt b/dll/win32/dciman32/CMakeLists.txt index ece88788a6e..fb294b1db3a 100644 --- a/dll/win32/dciman32/CMakeLists.txt +++ b/dll/win32/dciman32/CMakeLists.txt @@ -15,4 +15,4 @@ target_link_libraries(dciman32 add_importlibs(dciman32 kernel32 ntdll) add_dependencies(dciman32 dciman32_def) -add_livecd_target(dciman32 reactos/system32) +add_cab_target(dciman32 1) diff --git a/dll/win32/devmgr/CMakeLists.txt b/dll/win32/devmgr/CMakeLists.txt index f331ffff2a6..0150e7fbdd2 100644 --- a/dll/win32/devmgr/CMakeLists.txt +++ b/dll/win32/devmgr/CMakeLists.txt @@ -30,4 +30,4 @@ add_importlibs(devmgr add_pch(devmgr ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) add_dependencies(devmgr devmgr_def) -add_livecd_target(devmgr reactos/system32) +add_cab_target(devmgr 1) diff --git a/dll/win32/dhcpcsvc/CMakeLists.txt b/dll/win32/dhcpcsvc/CMakeLists.txt index 58a8cd87894..62f6ded38c5 100644 --- a/dll/win32/dhcpcsvc/CMakeLists.txt +++ b/dll/win32/dhcpcsvc/CMakeLists.txt @@ -32,4 +32,4 @@ target_link_libraries(dhcpcsvc ${CMAKE_CURRENT_BINARY_DIR}/dhcpcsvc.def) add_importlibs(dhcpcsvc ws2_32 iphlpapi advapi32 msvcrt kernel32 ntdll) add_pch(dhcpcsvc ${CMAKE_CURRENT_SOURCE_DIR}/include/rosdhcp.h ${SOURCE}) add_dependencies(dhcpcsvc dhcpcsvc_def) -add_livecd_target(dhcpcsvc reactos/system32) +add_cab_target(dhcpcsvc 1) diff --git a/dll/win32/dnsapi/CMakeLists.txt b/dll/win32/dnsapi/CMakeLists.txt index c0c5e8cfcb0..5b2f887c2d8 100644 --- a/dll/win32/dnsapi/CMakeLists.txt +++ b/dll/win32/dnsapi/CMakeLists.txt @@ -32,4 +32,4 @@ target_link_libraries(dnsapi add_importlibs(dnsapi user32 ws2_32 iphlpapi msvcrt kernel32 ntdll) add_pch(dnsapi ${CMAKE_CURRENT_SOURCE_DIR}/dnsapi/precomp.h ${SOURCE}) add_dependencies(dnsapi dnsapi_def psdk buildno_header) -add_livecd_target(dnsapi reactos/system32) \ No newline at end of file +add_cab_target(dnsapi 1) \ No newline at end of file diff --git a/dll/win32/dwmapi/CMakeLists.txt b/dll/win32/dwmapi/CMakeLists.txt index 8238a767db9..b11168f6aff 100644 --- a/dll/win32/dwmapi/CMakeLists.txt +++ b/dll/win32/dwmapi/CMakeLists.txt @@ -15,4 +15,4 @@ target_link_libraries(dwmapi add_importlibs(dwmapi kernel32 ntdll) add_dependencies(dwmapi dwmapi_def) -add_livecd_target(dwmapi reactos/system32) +add_cab_target(dwmapi 1) diff --git a/dll/win32/faultrep/CMakeLists.txt b/dll/win32/faultrep/CMakeLists.txt index e969c3db3b2..43a80468168 100644 --- a/dll/win32/faultrep/CMakeLists.txt +++ b/dll/win32/faultrep/CMakeLists.txt @@ -15,4 +15,4 @@ target_link_libraries(faultrep add_importlibs(faultrep advapi32 kernel32 ntdll) add_dependencies(faultrep faultrep_def) -add_livecd_target(faultrep reactos/system32) +add_cab_target(faultrep 1) diff --git a/dll/win32/fmifs/CMakeLists.txt b/dll/win32/fmifs/CMakeLists.txt index 22a14a9b87b..eaa2334ef8c 100644 --- a/dll/win32/fmifs/CMakeLists.txt +++ b/dll/win32/fmifs/CMakeLists.txt @@ -21,4 +21,4 @@ target_link_libraries(fmifs ${CMAKE_CURRENT_BINARY_DIR}/fmifs.def) add_importlibs(fmifs kernel32 ntdll) add_dependencies(fmifs fmifs_def psdk buildno_header) -add_livecd_target(fmifs reactos/system32) +add_cab_target(fmifs 1) diff --git a/dll/win32/fusion/CMakeLists.txt b/dll/win32/fusion/CMakeLists.txt index 3b8d80e8f8b..7a5131f43a0 100644 --- a/dll/win32/fusion/CMakeLists.txt +++ b/dll/win32/fusion/CMakeLists.txt @@ -21,4 +21,4 @@ target_link_libraries(fusion add_importlibs(fusion shlwapi advapi32 dbghelp user32 kernel32 ntdll) add_dependencies(fusion fusion_def) -add_livecd_target(fusion reactos/system32) +add_cab_target(fusion 1) diff --git a/dll/win32/gdi32/CMakeLists.txt b/dll/win32/gdi32/CMakeLists.txt index f783cd2dc5c..7f4db6b13eb 100644 --- a/dll/win32/gdi32/CMakeLists.txt +++ b/dll/win32/gdi32/CMakeLists.txt @@ -52,4 +52,4 @@ target_link_libraries(gdi32 add_importlibs(gdi32 user32 advapi32 kernel32 ntdll) add_pch(gdi32 ${CMAKE_CURRENT_SOURCE_DIR}/include/precomp.h ${SOURCE}) -add_livecd_target(gdi32 reactos/system32) +add_cab_target(gdi32 1) diff --git a/dll/win32/gdiplus/CMakeLists.txt b/dll/win32/gdiplus/CMakeLists.txt index db7966cc535..78f54ac896e 100644 --- a/dll/win32/gdiplus/CMakeLists.txt +++ b/dll/win32/gdiplus/CMakeLists.txt @@ -43,4 +43,4 @@ target_link_libraries(gdiplus crt) endif(ARCH MATCHES amd64) add_dependencies(gdiplus gdiplus_def) -add_livecd_target(gdiplus reactos/system32) +add_cab_target(gdiplus 1) diff --git a/dll/win32/getuname/CMakeLists.txt b/dll/win32/getuname/CMakeLists.txt index 3847d12d524..64a6a23d87a 100644 --- a/dll/win32/getuname/CMakeLists.txt +++ b/dll/win32/getuname/CMakeLists.txt @@ -13,4 +13,4 @@ target_link_libraries(getuname ${CMAKE_CURRENT_BINARY_DIR}/getuname.def) add_importlibs(getuname kernel32 ntdll) add_dependencies(getuname getuname_def) -add_livecd_target(getuname reactos/system32) +add_cab_target(getuname 1) diff --git a/dll/win32/glu32/CMakeLists.txt b/dll/win32/glu32/CMakeLists.txt index 676f6068523..5b2f8c7c6bc 100644 --- a/dll/win32/glu32/CMakeLists.txt +++ b/dll/win32/glu32/CMakeLists.txt @@ -116,4 +116,4 @@ add_importlibs( ntdll) add_dependencies(glu32 glu32_def) -add_livecd_target(glu32 reactos/system32) \ No newline at end of file +add_cab_target(glu32 1) \ No newline at end of file diff --git a/dll/win32/hid/CMakeLists.txt b/dll/win32/hid/CMakeLists.txt index c0cceffc86b..378f5e65104 100644 --- a/dll/win32/hid/CMakeLists.txt +++ b/dll/win32/hid/CMakeLists.txt @@ -16,4 +16,4 @@ target_link_libraries(hid ${CMAKE_CURRENT_BINARY_DIR}/hid.def) add_importlibs(hid kernel32 ntdll) add_pch(hid ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) add_dependencies(hid hid_def) -add_livecd_target(hid reactos/system32) +add_cab_target(hid 1) diff --git a/dll/win32/hlink/CMakeLists.txt b/dll/win32/hlink/CMakeLists.txt index 8f40be8ab90..219088131d0 100644 --- a/dll/win32/hlink/CMakeLists.txt +++ b/dll/win32/hlink/CMakeLists.txt @@ -26,4 +26,4 @@ add_importlibs(hlink ntdll) add_dependencies(hlink hlink_def) -add_livecd_target(hlink reactos/system32) +add_cab_target(hlink 1) diff --git a/dll/win32/hnetcfg/CMakeLists.txt b/dll/win32/hnetcfg/CMakeLists.txt index 3d4d72b1a93..1626ae52efc 100644 --- a/dll/win32/hnetcfg/CMakeLists.txt +++ b/dll/win32/hnetcfg/CMakeLists.txt @@ -29,4 +29,4 @@ add_importlibs(hnetcfg ntdll) add_dependencies(hnetcfg hnetcfg_def) -add_livecd_target(hnetcfg reactos/system32) +add_cab_target(hnetcfg 1) diff --git a/dll/win32/httpapi/CMakeLists.txt b/dll/win32/httpapi/CMakeLists.txt index 4ce2a0f8965..3a44c85a3c2 100644 --- a/dll/win32/httpapi/CMakeLists.txt +++ b/dll/win32/httpapi/CMakeLists.txt @@ -15,4 +15,4 @@ target_link_libraries(httpapi add_importlibs(httpapi kernel32 ntdll) add_dependencies(httpapi httpapi_def) -add_livecd_target(httpapi reactos/system32) +add_cab_target(httpapi 1) diff --git a/dll/win32/iccvid/CMakeLists.txt b/dll/win32/iccvid/CMakeLists.txt index 222c2fb658d..c974e3a570f 100644 --- a/dll/win32/iccvid/CMakeLists.txt +++ b/dll/win32/iccvid/CMakeLists.txt @@ -15,4 +15,4 @@ target_link_libraries(iccvid add_importlibs(iccvid user32 kernel32 ntdll) add_dependencies(iccvid iccvid_def) -add_livecd_target(iccvid reactos/system32) +add_cab_target(iccvid 1) diff --git a/dll/win32/icmp/CMakeLists.txt b/dll/win32/icmp/CMakeLists.txt index 0e78997f3e9..9f6b2f706c5 100644 --- a/dll/win32/icmp/CMakeLists.txt +++ b/dll/win32/icmp/CMakeLists.txt @@ -13,4 +13,4 @@ target_link_libraries(icmp add_importlibs(icmp ws2_32 kernel32 ntdll) add_dependencies(icmp icmp_def psdk) -add_livecd_target(icmp reactos/system32) +add_cab_target(icmp 1) diff --git a/dll/win32/imaadp32.acm/CMakeLists.txt b/dll/win32/imaadp32.acm/CMakeLists.txt index 3c0b40872ae..bab01578d6f 100644 --- a/dll/win32/imaadp32.acm/CMakeLists.txt +++ b/dll/win32/imaadp32.acm/CMakeLists.txt @@ -22,4 +22,4 @@ target_link_libraries(imaadp32.acm add_importlibs(imaadp32.acm winmm user32 msvcrt kernel32 ntdll) add_dependencies(imaadp32.acm imaadp32.acm_def psdk buildno_header) -add_livecd_target(imaadp32.acm reactos/system32) +add_cab_target(imaadp32.acm 1) diff --git a/dll/win32/imagehlp/CMakeLists.txt b/dll/win32/imagehlp/CMakeLists.txt index efc548ad64b..e9198f9b747 100644 --- a/dll/win32/imagehlp/CMakeLists.txt +++ b/dll/win32/imagehlp/CMakeLists.txt @@ -26,4 +26,4 @@ target_link_libraries(imagehlp add_importlibs(imagehlp dbghelp kernel32 ntdll) add_pch(imagehlp ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) add_dependencies(imagehlp imagehlp_def) -add_livecd_target(imagehlp reactos/system32) +add_cab_target(imagehlp 1) diff --git a/dll/win32/imm32/CMakeLists.txt b/dll/win32/imm32/CMakeLists.txt index 5ee585bf86e..7ef770fff2d 100644 --- a/dll/win32/imm32/CMakeLists.txt +++ b/dll/win32/imm32/CMakeLists.txt @@ -18,4 +18,4 @@ target_link_libraries(imm32 add_importlibs(imm32 advapi32 user32 kernel32 ntdll) add_dependencies(imm32 imm32_def) -add_livecd_target(imm32 reactos/system32) +add_cab_target(imm32 1) diff --git a/dll/win32/inetcomm/CMakeLists.txt b/dll/win32/inetcomm/CMakeLists.txt index 30481427e0d..83c71966f95 100644 --- a/dll/win32/inetcomm/CMakeLists.txt +++ b/dll/win32/inetcomm/CMakeLists.txt @@ -33,4 +33,4 @@ add_importlibs(inetcomm ntdll) add_dependencies(inetcomm inetcomm_def) -add_livecd_target(inetcomm reactos/system32) +add_cab_target(inetcomm 1) diff --git a/dll/win32/inetmib1/CMakeLists.txt b/dll/win32/inetmib1/CMakeLists.txt index 28eb7215662..05c1750a7a6 100644 --- a/dll/win32/inetmib1/CMakeLists.txt +++ b/dll/win32/inetmib1/CMakeLists.txt @@ -21,4 +21,4 @@ add_importlibs(inetmib1 ntdll) add_dependencies(inetmib1 inetmib1_def) -add_livecd_target(inetmib1 reactos/system32) +add_cab_target(inetmib1 1) diff --git a/dll/win32/initpki/CMakeLists.txt b/dll/win32/initpki/CMakeLists.txt index 7a051ecb24f..f1d8eb7ad2c 100644 --- a/dll/win32/initpki/CMakeLists.txt +++ b/dll/win32/initpki/CMakeLists.txt @@ -14,4 +14,4 @@ target_link_libraries(initpki add_importlibs(initpki kernel32 ntdll) add_dependencies(initpki initpki_def) -add_livecd_target(initpki reactos/system32) +add_cab_target(initpki 1) diff --git a/dll/win32/inseng/CMakeLists.txt b/dll/win32/inseng/CMakeLists.txt index 39f0e7ac707..ec1e2522a45 100644 --- a/dll/win32/inseng/CMakeLists.txt +++ b/dll/win32/inseng/CMakeLists.txt @@ -22,4 +22,4 @@ add_importlibs(inseng ntdll) add_dependencies(inseng inseng_def) -add_livecd_target(inseng reactos/system32) +add_cab_target(inseng 1) diff --git a/dll/win32/iphlpapi/CMakeLists.txt b/dll/win32/iphlpapi/CMakeLists.txt index 796edb2ae98..ec4811b2757 100644 --- a/dll/win32/iphlpapi/CMakeLists.txt +++ b/dll/win32/iphlpapi/CMakeLists.txt @@ -30,4 +30,4 @@ target_link_libraries(iphlpapi add_importlibs(iphlpapi dhcpcsvc advapi32 ws2_32 msvcrt kernel32 ntdll) add_dependencies(iphlpapi iphlpapi_def) -add_livecd_target(iphlpapi reactos/system32) +add_cab_target(iphlpapi 1) diff --git a/dll/win32/iprtprio/CMakeLists.txt b/dll/win32/iprtprio/CMakeLists.txt index bce57cb129c..661d556b55b 100644 --- a/dll/win32/iprtprio/CMakeLists.txt +++ b/dll/win32/iprtprio/CMakeLists.txt @@ -14,4 +14,4 @@ target_link_libraries(itircl add_importlibs(itircl kernel32 ntdll) add_dependencies(itircl itircl_def psdk) -add_livecd_target(itircl reactos/system32) +add_cab_target(itircl 1) diff --git a/dll/win32/itircl/CMakeLists.txt b/dll/win32/itircl/CMakeLists.txt index bce57cb129c..661d556b55b 100644 --- a/dll/win32/itircl/CMakeLists.txt +++ b/dll/win32/itircl/CMakeLists.txt @@ -14,4 +14,4 @@ target_link_libraries(itircl add_importlibs(itircl kernel32 ntdll) add_dependencies(itircl itircl_def psdk) -add_livecd_target(itircl reactos/system32) +add_cab_target(itircl 1) diff --git a/dll/win32/itss/CMakeLists.txt b/dll/win32/itss/CMakeLists.txt index 920e419fc7d..3d4619d5213 100644 --- a/dll/win32/itss/CMakeLists.txt +++ b/dll/win32/itss/CMakeLists.txt @@ -28,4 +28,4 @@ add_importlibs(itss ntdll) add_dependencies(itss itss_def wineheaders) -add_livecd_target(itss reactos/system32) +add_cab_target(itss 1) diff --git a/dll/win32/jscript/CMakeLists.txt b/dll/win32/jscript/CMakeLists.txt index 15aa68df787..923f005af3a 100644 --- a/dll/win32/jscript/CMakeLists.txt +++ b/dll/win32/jscript/CMakeLists.txt @@ -51,4 +51,4 @@ add_importlibs(jscript ntdll) add_dependencies(jscript jsglobal jscript_def stdole2) -add_livecd_target(jscript reactos/system32) +add_cab_target(jscript 1) diff --git a/dll/win32/kernel32/CMakeLists.txt b/dll/win32/kernel32/CMakeLists.txt index d8fcfdc201c..113e51d18a5 100644 --- a/dll/win32/kernel32/CMakeLists.txt +++ b/dll/win32/kernel32/CMakeLists.txt @@ -117,4 +117,4 @@ target_link_libraries(kernel32 ${CMAKE_CURRENT_SOURCE_DIR}/kernel32.def add_importlibs(kernel32 ntdll) add_pch(kernel32 ${CMAKE_CURRENT_SOURCE_DIR}/k32.h ${SOURCE}) add_dependencies(kernel32 errcodes) -add_livecd_target(kernel32 reactos/system32) +add_cab_target(kernel32 1) diff --git a/dll/win32/loadperf/CMakeLists.txt b/dll/win32/loadperf/CMakeLists.txt index b17f239d501..f9f6bf0af70 100644 --- a/dll/win32/loadperf/CMakeLists.txt +++ b/dll/win32/loadperf/CMakeLists.txt @@ -14,4 +14,4 @@ target_link_libraries(loadperf add_importlibs(loadperf kernel32 ntdll) add_dependencies(loadperf loadperf_def) -add_livecd_target(loadperf reactos/system32) +add_cab_target(loadperf 1) diff --git a/dll/win32/localspl/CMakeLists.txt b/dll/win32/localspl/CMakeLists.txt index 7f0d943eaa8..a9519c4efab 100644 --- a/dll/win32/localspl/CMakeLists.txt +++ b/dll/win32/localspl/CMakeLists.txt @@ -26,4 +26,4 @@ add_importlibs(localspl ntdll) add_dependencies(localspl localspl_def) -add_livecd_target(localspl reactos/system32) +add_cab_target(localspl 1) diff --git a/dll/win32/localui/CMakeLists.txt b/dll/win32/localui/CMakeLists.txt index 7abed8c1b8a..474484ebf3f 100644 --- a/dll/win32/localui/CMakeLists.txt +++ b/dll/win32/localui/CMakeLists.txt @@ -15,4 +15,4 @@ target_link_libraries(localui add_importlibs(localui winspool user32 kernel32 ntdll) add_dependencies(localui localui_def) -add_livecd_target(localui reactos/system32) +add_cab_target(localui 1) diff --git a/dll/win32/lpk/CMakeLists.txt b/dll/win32/lpk/CMakeLists.txt index aadb9ea28ef..434d560a559 100644 --- a/dll/win32/lpk/CMakeLists.txt +++ b/dll/win32/lpk/CMakeLists.txt @@ -14,4 +14,4 @@ target_link_libraries(lpk ${CMAKE_CURRENT_BINARY_DIR}/lpk.def) add_importlibs(lpk user32 usp10 kernel32 ntdll) add_dependencies(lpk lpk_def) -add_livecd_target(lpk reactos/system32) +add_cab_target(lpk 1) diff --git a/dll/win32/lsasrv/CMakeLists.txt b/dll/win32/lsasrv/CMakeLists.txt index 26675580ef9..0458c8c25fb 100644 --- a/dll/win32/lsasrv/CMakeLists.txt +++ b/dll/win32/lsasrv/CMakeLists.txt @@ -24,4 +24,4 @@ target_link_libraries(lsasrv add_importlibs(lsasrv rpcrt4 kernel32 ntdll) add_dependencies(lsasrv lsasrv_def psdk buildno_header) -add_livecd_target(lsasrv reactos/system32) \ No newline at end of file +add_cab_target(lsasrv 1) \ No newline at end of file diff --git a/dll/win32/lz32/CMakeLists.txt b/dll/win32/lz32/CMakeLists.txt index df0142b5617..4037575f322 100644 --- a/dll/win32/lz32/CMakeLists.txt +++ b/dll/win32/lz32/CMakeLists.txt @@ -14,4 +14,4 @@ target_link_libraries(lz32 add_importlibs(lz32 kernel32 ntdll) add_dependencies(lz32 lz32_def psdk buildno_header) -add_livecd_target(lz32 reactos/system32) \ No newline at end of file +add_cab_target(lz32 1) \ No newline at end of file diff --git a/dll/win32/mapi32/CMakeLists.txt b/dll/win32/mapi32/CMakeLists.txt index 01f90543ac5..bf487636268 100644 --- a/dll/win32/mapi32/CMakeLists.txt +++ b/dll/win32/mapi32/CMakeLists.txt @@ -21,4 +21,4 @@ target_link_libraries(mapi32 add_importlibs(mapi32 shlwapi shell32 user32 advapi32 kernel32 ntdll) add_dependencies(mapi32 mapi32_def) -add_livecd_target(mapi32 reactos/system32) +add_cab_target(mapi32 1) diff --git a/dll/win32/mciavi32/CMakeLists.txt b/dll/win32/mciavi32/CMakeLists.txt index e508cf3d044..49f2df7f97c 100644 --- a/dll/win32/mciavi32/CMakeLists.txt +++ b/dll/win32/mciavi32/CMakeLists.txt @@ -19,4 +19,4 @@ target_link_libraries(mciavi32 add_importlibs(mciavi32 msvfw32 winmm user32 gdi32 kernel32 ntdll) add_dependencies(mciavi32 mciavi32_def) -add_livecd_target(mciavi32 reactos/system32) +add_cab_target(mciavi32 1) diff --git a/dll/win32/mcicda/CMakeLists.txt b/dll/win32/mcicda/CMakeLists.txt index 1ede7b516c7..d3b3aeeb4dd 100644 --- a/dll/win32/mcicda/CMakeLists.txt +++ b/dll/win32/mcicda/CMakeLists.txt @@ -14,4 +14,4 @@ target_link_libraries(mcicda add_importlibs(mcicda winmm user32 kernel32 ntdll) add_dependencies(mcicda mcicda_def psdk buildno_header) -add_livecd_target(mcicda reactos/system32) \ No newline at end of file +add_cab_target(mcicda 1) \ No newline at end of file diff --git a/dll/win32/mciqtz32/CMakeLists.txt b/dll/win32/mciqtz32/CMakeLists.txt index 71c47aa3dbf..e1bb8aa02bc 100644 --- a/dll/win32/mciqtz32/CMakeLists.txt +++ b/dll/win32/mciqtz32/CMakeLists.txt @@ -15,4 +15,4 @@ target_link_libraries(mciqtz32 add_importlibs(mciqtz32 winmm oleaut32 ole32 user32 gdi32 kernel32 ntdll) add_dependencies(mciqtz32 mciqtz32_def) -add_livecd_target(mciqtz32 reactos/system32) +add_cab_target(mciqtz32 1) diff --git a/dll/win32/mciseq/CMakeLists.txt b/dll/win32/mciseq/CMakeLists.txt index d9d86cd8308..87feac61733 100644 --- a/dll/win32/mciseq/CMakeLists.txt +++ b/dll/win32/mciseq/CMakeLists.txt @@ -14,4 +14,4 @@ target_link_libraries(mciseq add_importlibs(mciseq winmm user32 kernel32 ntdll) add_dependencies(mciseq mciseq_def psdk buildno_header) -add_livecd_target(mciseq reactos/system32) \ No newline at end of file +add_cab_target(mciseq 1) \ No newline at end of file diff --git a/dll/win32/mciwave/CMakeLists.txt b/dll/win32/mciwave/CMakeLists.txt index 302698a5f57..5a0eb211f39 100644 --- a/dll/win32/mciwave/CMakeLists.txt +++ b/dll/win32/mciwave/CMakeLists.txt @@ -17,4 +17,4 @@ target_link_libraries(mciwave add_importlibs(mciwave winmm user32 msvcrt kernel32 ntdll) add_dependencies(mciwave mciwave_def psdk buildno_header) -add_livecd_target(mciwave reactos/system32) +add_cab_target(mciwave 1) diff --git a/dll/win32/mlang/CMakeLists.txt b/dll/win32/mlang/CMakeLists.txt index f71107ed504..daf5328365e 100644 --- a/dll/win32/mlang/CMakeLists.txt +++ b/dll/win32/mlang/CMakeLists.txt @@ -25,4 +25,4 @@ add_importlibs(mlang ntdll) add_dependencies(mlang mlang_def psdk buildno_header) -add_livecd_target(mlang reactos/system32) \ No newline at end of file +add_cab_target(mlang 1) \ No newline at end of file diff --git a/dll/win32/mmdrv/CMakeLists.txt b/dll/win32/mmdrv/CMakeLists.txt index aaa077e05fd..4d502b4d73d 100644 --- a/dll/win32/mmdrv/CMakeLists.txt +++ b/dll/win32/mmdrv/CMakeLists.txt @@ -20,4 +20,4 @@ target_link_libraries(mmdrv ${CMAKE_CURRENT_BINARY_DIR}/mmdrv.def) add_importlibs(mmdrv winmm user32 kernel32 ntdll) add_dependencies(mmdrv mmdrv_def psdk buildno_header) -add_livecd_target(mmdrv reactos/system32) \ No newline at end of file +add_cab_target(mmdrv 1) \ No newline at end of file diff --git a/dll/win32/modemui/CMakeLists.txt b/dll/win32/modemui/CMakeLists.txt index 07c2e5b8855..c03dbcdeba5 100644 --- a/dll/win32/modemui/CMakeLists.txt +++ b/dll/win32/modemui/CMakeLists.txt @@ -11,4 +11,4 @@ target_link_libraries(modemui ${CMAKE_CURRENT_BINARY_DIR}/modemui.def) add_importlibs(modemui kernel32) add_dependencies(modemui modemui_def) -add_livecd_target(modemui reactos/system32) +add_cab_target(modemui 1) diff --git a/dll/win32/mpr/CMakeLists.txt b/dll/win32/mpr/CMakeLists.txt index f40e9f72035..be03b206996 100644 --- a/dll/win32/mpr/CMakeLists.txt +++ b/dll/win32/mpr/CMakeLists.txt @@ -23,4 +23,4 @@ target_link_libraries(mpr add_importlibs(mpr advapi32 user32 kernel32 ntdll) add_dependencies(mpr mpr_def) -add_livecd_target(mpr reactos/system32) +add_cab_target(mpr 1) diff --git a/dll/win32/mprapi/CMakeLists.txt b/dll/win32/mprapi/CMakeLists.txt index 2c4b653b181..74b2181d7fb 100644 --- a/dll/win32/mprapi/CMakeLists.txt +++ b/dll/win32/mprapi/CMakeLists.txt @@ -14,4 +14,4 @@ target_link_libraries(mprapi add_importlibs(mprapi kernel32 ntdll) add_dependencies(mprapi mprapi_def) -add_livecd_target(mprapi reactos/system32) +add_cab_target(mprapi 1) diff --git a/dll/win32/msacm32/CMakeLists.txt b/dll/win32/msacm32/CMakeLists.txt index 0bd6304a18c..1b48c288b10 100644 --- a/dll/win32/msacm32/CMakeLists.txt +++ b/dll/win32/msacm32/CMakeLists.txt @@ -25,4 +25,4 @@ add_importlibs(msacm32 msvcrt advapi32 user32 winmm kernel32 ntdll) add_dependencies(msacm32 msacm32_def) add_subdirectory(msacm32.drv) -add_livecd_target(msacm32 reactos/system32) +add_cab_target(msacm32 1) diff --git a/dll/win32/msacm32/msacm32.drv/CMakeLists.txt b/dll/win32/msacm32/msacm32.drv/CMakeLists.txt index adcd1b07cfe..7da42f69da7 100644 --- a/dll/win32/msacm32/msacm32.drv/CMakeLists.txt +++ b/dll/win32/msacm32/msacm32.drv/CMakeLists.txt @@ -21,4 +21,4 @@ target_link_libraries(msacm32.drv add_importlibs(msacm32.drv msacm32 user32 winmm advapi32 kernel32 ntdll) add_dependencies(msacm32.drv msacm32.drv_def psdk buildno_header) -add_livecd_target(msacm32.drv reactos/system32) \ No newline at end of file +add_cab_target(msacm32.drv 1) \ No newline at end of file diff --git a/dll/win32/msadp32.acm/CMakeLists.txt b/dll/win32/msadp32.acm/CMakeLists.txt index 91593c059a4..4f00807992c 100644 --- a/dll/win32/msadp32.acm/CMakeLists.txt +++ b/dll/win32/msadp32.acm/CMakeLists.txt @@ -22,4 +22,4 @@ target_link_libraries(msadp32.acm add_importlibs(msadp32.acm winmm user32 msvcrt kernel32 ntdll) add_dependencies(msadp32.acm msadp32.acm_def psdk buildno_header) -add_livecd_target(msadp32.acm reactos/system32) +add_cab_target(msadp32.acm 1) diff --git a/dll/win32/msafd/CMakeLists.txt b/dll/win32/msafd/CMakeLists.txt index 1ab57f582da..cdaadaef21c 100644 --- a/dll/win32/msafd/CMakeLists.txt +++ b/dll/win32/msafd/CMakeLists.txt @@ -26,4 +26,4 @@ add_pch(msafd ${CMAKE_CURRENT_SOURCE_DIR}/msafd.h ${SOURCE}) add_importlibs(msafd advapi32 kernel32 ntdll) add_dependencies(msafd msafd_def) -add_livecd_target(msafd reactos/system32) +add_cab_target(msafd 1) diff --git a/dll/win32/mscat32/CMakeLists.txt b/dll/win32/mscat32/CMakeLists.txt index de2f8da234b..d1a7cab526d 100644 --- a/dll/win32/mscat32/CMakeLists.txt +++ b/dll/win32/mscat32/CMakeLists.txt @@ -15,4 +15,4 @@ target_link_libraries(mscat32 add_importlibs(mscat32 wintrust kernel32 ntdll) add_dependencies(mscat32 mscat32_def) -add_livecd_target(mscat32 reactos/system32) +add_cab_target(mscat32 1) diff --git a/dll/win32/mscms/CMakeLists.txt b/dll/win32/mscms/CMakeLists.txt index 07e50d97ca5..11c618e4df3 100644 --- a/dll/win32/mscms/CMakeLists.txt +++ b/dll/win32/mscms/CMakeLists.txt @@ -21,4 +21,4 @@ target_link_libraries(mscms add_importlibs(mscms kernel32 ntdll) add_dependencies(mscms mscms_def) -add_livecd_target(mscms reactos/system32) +add_cab_target(mscms 1) diff --git a/dll/win32/mscoree/CMakeLists.txt b/dll/win32/mscoree/CMakeLists.txt index 29c4296a1da..6cc55336c43 100644 --- a/dll/win32/mscoree/CMakeLists.txt +++ b/dll/win32/mscoree/CMakeLists.txt @@ -15,4 +15,4 @@ target_link_libraries(mscoree add_importlibs(mscoree advapi32 shell32 kernel32 ntdll) add_dependencies(mscoree mscoree_def) -add_livecd_target(mscoree reactos/system32) +add_cab_target(mscoree 1) diff --git a/dll/win32/msctf/CMakeLists.txt b/dll/win32/msctf/CMakeLists.txt index d4a0a167659..1c9f18768a9 100644 --- a/dll/win32/msctf/CMakeLists.txt +++ b/dll/win32/msctf/CMakeLists.txt @@ -30,4 +30,4 @@ target_link_libraries(msctf add_importlibs(msctf ole32 oleaut32 user32 advapi32 kernel32 ntdll) add_dependencies(msctf msctf_def) -add_livecd_target(msctf reactos/system32) +add_cab_target(msctf 1) diff --git a/dll/win32/msftedit/CMakeLists.txt b/dll/win32/msftedit/CMakeLists.txt index 46339981855..44611a74113 100644 --- a/dll/win32/msftedit/CMakeLists.txt +++ b/dll/win32/msftedit/CMakeLists.txt @@ -18,4 +18,4 @@ target_link_libraries(msftedit add_importlibs(msftedit riched20 kernel32 ntdll) add_dependencies(msftedit msftedit_def) -add_livecd_target(msftedit reactos/system32) +add_cab_target(msftedit 1) diff --git a/dll/win32/msg711.acm/CMakeLists.txt b/dll/win32/msg711.acm/CMakeLists.txt index 25f8b27c4b0..41f999d7cdc 100644 --- a/dll/win32/msg711.acm/CMakeLists.txt +++ b/dll/win32/msg711.acm/CMakeLists.txt @@ -22,4 +22,4 @@ target_link_libraries(msg711.acm add_importlibs(msg711.acm winmm user32 msvcrt kernel32 ntdll) add_dependencies(msg711.acm msg711.acm_def psdk buildno_header) -add_livecd_target(msg711.acm reactos/system32) +add_cab_target(msg711.acm 1) diff --git a/dll/win32/msgina/CMakeLists.txt b/dll/win32/msgina/CMakeLists.txt index 1c8bfbb0610..386cbc79d13 100644 --- a/dll/win32/msgina/CMakeLists.txt +++ b/dll/win32/msgina/CMakeLists.txt @@ -19,4 +19,4 @@ target_link_libraries(msgina add_importlibs(msgina advapi32 user32 gdi32 userenv kernel32 ntdll) add_dependencies(msgina msgina_def) -add_livecd_target(msgina reactos/system32) +add_cab_target(msgina 1) diff --git a/dll/win32/msgsm32.acm/CMakeLists.txt b/dll/win32/msgsm32.acm/CMakeLists.txt index a8addf06c7d..d139c8ae931 100644 --- a/dll/win32/msgsm32.acm/CMakeLists.txt +++ b/dll/win32/msgsm32.acm/CMakeLists.txt @@ -22,4 +22,4 @@ target_link_libraries(msgsm32.acm add_importlibs(msgsm32.acm winmm user32 msvcrt kernel32 ntdll) add_dependencies(msgsm32.acm msgsm32.acm_def psdk buildno_header) -add_livecd_target(msgsm32.acm reactos/system32) +add_cab_target(msgsm32.acm 1) diff --git a/dll/win32/mshtml.tlb/CMakeLists.txt b/dll/win32/mshtml.tlb/CMakeLists.txt index d03aa4056ca..9c3683519a1 100644 --- a/dll/win32/mshtml.tlb/CMakeLists.txt +++ b/dll/win32/mshtml.tlb/CMakeLists.txt @@ -21,4 +21,4 @@ set_target_properties(mshtml.tlb PROPERTIES SUFFIX "") target_link_libraries(mshtml.tlb ${CMAKE_CURRENT_BINARY_DIR}/mshtml.tlb.def) add_dependencies(mshtml.tlb mshtml_tlb mshtml.tlb_def) -add_livecd_target(mshtml.tlb reactos/system32) +add_cab_target(mshtml.tlb 1) diff --git a/dll/win32/mshtml/CMakeLists.txt b/dll/win32/mshtml/CMakeLists.txt index 8557cf56137..1ac233d8ce5 100644 --- a/dll/win32/mshtml/CMakeLists.txt +++ b/dll/win32/mshtml/CMakeLists.txt @@ -100,4 +100,4 @@ add_importlibs(mshtml ntdll) add_dependencies(mshtml mshtml_nsiface_header mshtml_def) -add_livecd_target(mshtml reactos/system32) +add_cab_target(mshtml 1) diff --git a/dll/win32/msimg32/CMakeLists.txt b/dll/win32/msimg32/CMakeLists.txt index 1b1ab0939ed..efef0979a17 100644 --- a/dll/win32/msimg32/CMakeLists.txt +++ b/dll/win32/msimg32/CMakeLists.txt @@ -14,4 +14,4 @@ target_link_libraries(msimg32 add_importlibs(msimg32 gdi32 kernel32 ntdll) add_dependencies(msimg32 msimg32_def) -add_livecd_target(msimg32 reactos/system32) +add_cab_target(msimg32 1) diff --git a/dll/win32/msimtf/CMakeLists.txt b/dll/win32/msimtf/CMakeLists.txt index 1ce009654f5..2d889ef785a 100644 --- a/dll/win32/msimtf/CMakeLists.txt +++ b/dll/win32/msimtf/CMakeLists.txt @@ -18,4 +18,4 @@ target_link_libraries(msimtf add_importlibs(msimtf msvcrt imm32 kernel32 ntdll) add_dependencies(msimtf msimtf_def) -add_livecd_target(msimtf reactos/system32) +add_cab_target(msimtf 1) diff --git a/dll/win32/msisip/CMakeLists.txt b/dll/win32/msisip/CMakeLists.txt index efca2f3839e..82c79e97bee 100644 --- a/dll/win32/msisip/CMakeLists.txt +++ b/dll/win32/msisip/CMakeLists.txt @@ -14,4 +14,4 @@ target_link_libraries(msisip add_importlibs(msisip crypt32 ole32 kernel32 ntdll) add_dependencies(msisip msisip_def) -add_livecd_target(msisip reactos/system32) +add_cab_target(msisip 1) diff --git a/dll/win32/msnet32/CMakeLists.txt b/dll/win32/msnet32/CMakeLists.txt index d2884ce74fa..cfed51e9551 100644 --- a/dll/win32/msnet32/CMakeLists.txt +++ b/dll/win32/msnet32/CMakeLists.txt @@ -14,4 +14,4 @@ target_link_libraries(msnet32 add_importlibs(msnet32 kernel32 ntdll) add_dependencies(msnet32 msnet32_def) -add_livecd_target(msnet32 reactos/system32) +add_cab_target(msnet32 1) diff --git a/dll/win32/msrle32/CMakeLists.txt b/dll/win32/msrle32/CMakeLists.txt index 659cb8a6f26..736d5a07ab2 100644 --- a/dll/win32/msrle32/CMakeLists.txt +++ b/dll/win32/msrle32/CMakeLists.txt @@ -16,4 +16,4 @@ target_link_libraries(msrle32 add_importlibs(msrle32 msvcrt winmm user32 kernel32 ntdll) add_dependencies(msrle32 msrle32_def) -add_livecd_target(msrle32 reactos/system32) +add_cab_target(msrle32 1) diff --git a/dll/win32/mssign32/CMakeLists.txt b/dll/win32/mssign32/CMakeLists.txt index 1f291eaf749..2d1ba4cec0e 100644 --- a/dll/win32/mssign32/CMakeLists.txt +++ b/dll/win32/mssign32/CMakeLists.txt @@ -14,4 +14,4 @@ target_link_libraries(mssign32 add_importlibs(mssign32 kernel32 ntdll) add_dependencies(mssign32 mssign32_def) -add_livecd_target(mssign32 reactos/system32) +add_cab_target(mssign32 1) diff --git a/dll/win32/mssip32/CMakeLists.txt b/dll/win32/mssip32/CMakeLists.txt index 81bd6ca7a8b..65c3dcceaa9 100644 --- a/dll/win32/mssip32/CMakeLists.txt +++ b/dll/win32/mssip32/CMakeLists.txt @@ -14,4 +14,4 @@ target_link_libraries(mssip32 add_importlibs(mssip32 kernel32 ntdll) add_dependencies(mssip32 mssip32_def) -add_livecd_target(mssip32 reactos/system32) +add_cab_target(mssip32 1) diff --git a/dll/win32/mstask/CMakeLists.txt b/dll/win32/mstask/CMakeLists.txt index b60eae15aeb..5eb2ae10002 100644 --- a/dll/win32/mstask/CMakeLists.txt +++ b/dll/win32/mstask/CMakeLists.txt @@ -29,4 +29,4 @@ target_link_libraries(mstask add_importlibs(mstask ole32 ntdll) add_dependencies(mstask mstask_def) -add_livecd_target(mstask reactos/system32) +add_cab_target(mstask 1) diff --git a/dll/win32/msvcrt/CMakeLists.txt b/dll/win32/msvcrt/CMakeLists.txt index 4d8f6ef7e0b..394dd2e15d0 100644 --- a/dll/win32/msvcrt/CMakeLists.txt +++ b/dll/win32/msvcrt/CMakeLists.txt @@ -28,4 +28,4 @@ target_link_libraries(msvcrt add_pch(msvcrt ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) add_importlibs(msvcrt kernel32 ntdll) -add_livecd_target(msvcrt reactos/system32) +add_cab_target(msvcrt 1) diff --git a/dll/win32/msvcrt20/CMakeLists.txt b/dll/win32/msvcrt20/CMakeLists.txt index b39b1c3b18b..e556306829f 100644 --- a/dll/win32/msvcrt20/CMakeLists.txt +++ b/dll/win32/msvcrt20/CMakeLists.txt @@ -16,4 +16,4 @@ target_link_libraries(msvcrt20 add_importlibs(msvcrt20 msvcrt kernel32 ntdll) add_dependencies(msvcrt20 msvcrt20_def psdk buildno_header) -add_livecd_target(msvcrt20 reactos/system32) +add_cab_target(msvcrt20 1) diff --git a/dll/win32/msvcrt40/CMakeLists.txt b/dll/win32/msvcrt40/CMakeLists.txt index b1c5f2fc077..29e0426d826 100644 --- a/dll/win32/msvcrt40/CMakeLists.txt +++ b/dll/win32/msvcrt40/CMakeLists.txt @@ -16,4 +16,4 @@ target_link_libraries(msvcrt40 add_importlibs(msvcrt40 msvcrt kernel32 ntdll) add_dependencies(msvcrt40 msvcrt40_def) -add_livecd_target(msvcrt40 reactos/system32) +add_cab_target(msvcrt40 1) diff --git a/dll/win32/msvfw32/CMakeLists.txt b/dll/win32/msvfw32/CMakeLists.txt index 5c50be397f6..1c2f290c693 100644 --- a/dll/win32/msvfw32/CMakeLists.txt +++ b/dll/win32/msvfw32/CMakeLists.txt @@ -20,4 +20,4 @@ target_link_libraries(msvfw32 add_importlibs(msvfw32 winmm version comctl32 user32 gdi32 advapi32 kernel32 ntdll) add_dependencies(msvfw32 msvfw32_def) -add_livecd_target(msvfw32 reactos/system32) +add_cab_target(msvfw32 1) diff --git a/dll/win32/msvidc32/CMakeLists.txt b/dll/win32/msvidc32/CMakeLists.txt index e3cdc908dfe..083ba15dc5d 100644 --- a/dll/win32/msvidc32/CMakeLists.txt +++ b/dll/win32/msvidc32/CMakeLists.txt @@ -16,4 +16,4 @@ target_link_libraries(msvidc32 add_importlibs(msvidc32 user32 kernel32 ntdll) add_dependencies(msvidc32 msvidc32_def) -add_livecd_target(msvidc32 reactos/system32) +add_cab_target(msvidc32 1) diff --git a/dll/win32/mswsock/CMakeLists.txt b/dll/win32/mswsock/CMakeLists.txt index a08d0c8b76e..51ae71295ab 100644 --- a/dll/win32/mswsock/CMakeLists.txt +++ b/dll/win32/mswsock/CMakeLists.txt @@ -17,4 +17,4 @@ target_link_libraries(mswsock ${CMAKE_CURRENT_BINARY_DIR}/mswsock.def) add_importlibs(mswsock ws2_32 kernel32) add_dependencies(mswsock mswsock_def) -add_livecd_target(mswsock reactos/system32) +add_cab_target(mswsock 1) diff --git a/dll/win32/msxml3/CMakeLists.txt b/dll/win32/msxml3/CMakeLists.txt index 679223d1ce1..a0fe51d614a 100644 --- a/dll/win32/msxml3/CMakeLists.txt +++ b/dll/win32/msxml3/CMakeLists.txt @@ -77,4 +77,4 @@ add_importlibs(msxml3 ntdll) add_dependencies(msxml3 msxml3_v1 msxml3_def) -add_livecd_target(msxml3 reactos/system32) +add_cab_target(msxml3 1) diff --git a/dll/win32/nddeapi/CMakeLists.txt b/dll/win32/nddeapi/CMakeLists.txt index 8d9940ba540..bde70840719 100644 --- a/dll/win32/nddeapi/CMakeLists.txt +++ b/dll/win32/nddeapi/CMakeLists.txt @@ -14,4 +14,4 @@ target_link_libraries(nddeapi add_importlibs(nddeapi kernel32 ntdll) add_dependencies(nddeapi nddeapi_def psdk buildno_header) -add_livecd_target(nddeapi reactos/system32) \ No newline at end of file +add_cab_target(nddeapi 1) \ No newline at end of file diff --git a/dll/win32/netapi32/CMakeLists.txt b/dll/win32/netapi32/CMakeLists.txt index 76ac6f81bbf..3dbb368badf 100644 --- a/dll/win32/netapi32/CMakeLists.txt +++ b/dll/win32/netapi32/CMakeLists.txt @@ -26,4 +26,4 @@ target_link_libraries(netapi32 add_importlibs(netapi32 iphlpapi ws2_32 advapi32 kernel32 ntdll) add_dependencies(netapi32 netapi32_def) -add_livecd_target(netapi32 reactos/system32) +add_cab_target(netapi32 1) diff --git a/dll/win32/netcfgx/CMakeLists.txt b/dll/win32/netcfgx/CMakeLists.txt index c9b2b97ed61..f145b734eb9 100644 --- a/dll/win32/netcfgx/CMakeLists.txt +++ b/dll/win32/netcfgx/CMakeLists.txt @@ -21,4 +21,4 @@ target_link_libraries(netcfgx add_importlibs(netcfgx rpcrt4 setupapi advapi32 iphlpapi ole32 user32 comctl32 ws2_32 kernel32 ntdll) add_dependencies(netcfgx netcfgx_def) -add_livecd_target(netcfgx reactos/system32) +add_cab_target(netcfgx 1) diff --git a/dll/win32/netevent/CMakeLists.txt b/dll/win32/netevent/CMakeLists.txt index bc7a5e8957d..bf1109bac57 100644 --- a/dll/win32/netevent/CMakeLists.txt +++ b/dll/win32/netevent/CMakeLists.txt @@ -15,4 +15,4 @@ target_link_libraries(netevent add_importlibs(netevent kernel32) add_dependencies(netevent netevent_def neteventmsg) -add_livecd_target(netevent reactos/system32) +add_cab_target(netevent 1) diff --git a/dll/win32/netid/CMakeLists.txt b/dll/win32/netid/CMakeLists.txt index b546ebd3619..4c8ebca75f1 100644 --- a/dll/win32/netid/CMakeLists.txt +++ b/dll/win32/netid/CMakeLists.txt @@ -10,4 +10,4 @@ target_link_libraries(netid add_importlibs(netid user32 gdi32 comctl32 advapi32 netapi32 kernel32 ntdll) add_dependencies(netid netid_def) -add_livecd_target(netid reactos/system32) +add_cab_target(netid 1) diff --git a/dll/win32/netshell/CMakeLists.txt b/dll/win32/netshell/CMakeLists.txt index 2ee1d3d4488..44d08460cb9 100644 --- a/dll/win32/netshell/CMakeLists.txt +++ b/dll/win32/netshell/CMakeLists.txt @@ -42,4 +42,4 @@ add_importlibs(netshell add_pch(netshell ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) add_dependencies(netshell netshell_def) -add_livecd_target(netshell reactos/system32) +add_cab_target(netshell 1) diff --git a/dll/win32/newdev/CMakeLists.txt b/dll/win32/newdev/CMakeLists.txt index debeba6077f..a7e0a414c5a 100644 --- a/dll/win32/newdev/CMakeLists.txt +++ b/dll/win32/newdev/CMakeLists.txt @@ -17,4 +17,4 @@ target_link_libraries(newdev add_importlibs(newdev gdi32 comctl32 setupapi advapi32 user32 shell32 kernel32 ntdll) add_dependencies(newdev newdev_def) -add_livecd_target(newdev reactos/system32) +add_cab_target(newdev 1) diff --git a/dll/win32/ntdsapi/CMakeLists.txt b/dll/win32/ntdsapi/CMakeLists.txt index 63be7bb4b39..3e680cc76c3 100644 --- a/dll/win32/ntdsapi/CMakeLists.txt +++ b/dll/win32/ntdsapi/CMakeLists.txt @@ -14,4 +14,4 @@ target_link_libraries(ntdsapi add_importlibs(ntdsapi user32 kernel32 ntdll) add_dependencies(ntdsapi ntdsapi_def psdk buildno_header) -add_livecd_target(ntdsapi reactos/system32) +add_cab_target(ntdsapi 1) diff --git a/dll/win32/ntlanman/CMakeLists.txt b/dll/win32/ntlanman/CMakeLists.txt index 6d03b54c65b..053d7e3b638 100644 --- a/dll/win32/ntlanman/CMakeLists.txt +++ b/dll/win32/ntlanman/CMakeLists.txt @@ -13,4 +13,4 @@ target_link_libraries(ntlanman add_importlibs(ntlanman netapi32 kernel32 ntdll) add_dependencies(ntlanman ntlanman_def) -add_livecd_target(ntlanman reactos/system32) +add_cab_target(ntlanman 1) diff --git a/dll/win32/ntmarta/CMakeLists.txt b/dll/win32/ntmarta/CMakeLists.txt index b8d01f02864..e7574b55aef 100644 --- a/dll/win32/ntmarta/CMakeLists.txt +++ b/dll/win32/ntmarta/CMakeLists.txt @@ -21,4 +21,4 @@ add_importlibs(ntmarta ntdll) add_dependencies(ntmarta ntmarta_def) -add_livecd_target(ntmarta reactos/system32) +add_cab_target(ntmarta 1) diff --git a/dll/win32/ntprint/CMakeLists.txt b/dll/win32/ntprint/CMakeLists.txt index 16f9b13636c..6ad55f39a0d 100644 --- a/dll/win32/ntprint/CMakeLists.txt +++ b/dll/win32/ntprint/CMakeLists.txt @@ -14,4 +14,4 @@ target_link_libraries(ntprint add_importlibs(ntprint winspool kernel32 ntdll) add_dependencies(ntprint ntprint_def psdk) -add_livecd_target(ntprint reactos/system32) +add_cab_target(ntprint 1) diff --git a/dll/win32/objsel/CMakeLists.txt b/dll/win32/objsel/CMakeLists.txt index 6447ed65d8c..ec02f5d3a30 100644 --- a/dll/win32/objsel/CMakeLists.txt +++ b/dll/win32/objsel/CMakeLists.txt @@ -29,4 +29,4 @@ add_importlibs(objsel ntdll) add_dependencies(objsel objsel_def) -add_livecd_target(objsel reactos/system32) +add_cab_target(objsel 1) diff --git a/dll/win32/odbc32/CMakeLists.txt b/dll/win32/odbc32/CMakeLists.txt index 954e449fba6..842bec9d82b 100644 --- a/dll/win32/odbc32/CMakeLists.txt +++ b/dll/win32/odbc32/CMakeLists.txt @@ -21,4 +21,4 @@ add_importlibs(odbc32 ntdll) add_dependencies(odbc32 odbc32_def) -add_livecd_target(odbc32 reactos/system32) +add_cab_target(odbc32 1) diff --git a/dll/win32/odbccp32/CMakeLists.txt b/dll/win32/odbccp32/CMakeLists.txt index 2d6b23339b1..9b6ccf82b36 100644 --- a/dll/win32/odbccp32/CMakeLists.txt +++ b/dll/win32/odbccp32/CMakeLists.txt @@ -22,4 +22,4 @@ add_importlibs(odbccp32 ntdll) add_dependencies(odbccp32 odbccp32_def) -add_livecd_target(odbccp32 reactos/system32) +add_cab_target(odbccp32 1) diff --git a/dll/win32/ole32/CMakeLists.txt b/dll/win32/ole32/CMakeLists.txt index b62c181f008..7d929770b42 100644 --- a/dll/win32/ole32/CMakeLists.txt +++ b/dll/win32/ole32/CMakeLists.txt @@ -73,4 +73,4 @@ target_link_libraries(ole32 add_importlibs(ole32 advapi32 user32 gdi32 rpcrt4 msvcrt kernel32 ntdll) add_dependencies(ole32 ole32_def ole32idl) -add_livecd_target(ole32 reactos/system32) \ No newline at end of file +add_cab_target(ole32 1) \ No newline at end of file diff --git a/dll/win32/oleacc/CMakeLists.txt b/dll/win32/oleacc/CMakeLists.txt index 9fef83f6243..dc453ce1138 100644 --- a/dll/win32/oleacc/CMakeLists.txt +++ b/dll/win32/oleacc/CMakeLists.txt @@ -19,4 +19,4 @@ add_importlibs(oleacc ntdll) add_dependencies(oleacc oleacc_def) -add_livecd_target(oleacc reactos/system32) \ No newline at end of file +add_cab_target(oleacc 1) \ No newline at end of file diff --git a/dll/win32/oleaut32/CMakeLists.txt b/dll/win32/oleaut32/CMakeLists.txt index fcf8179ac9f..0cf0595be11 100644 --- a/dll/win32/oleaut32/CMakeLists.txt +++ b/dll/win32/oleaut32/CMakeLists.txt @@ -60,4 +60,4 @@ add_dependencies(oleaut32 oleaut32_def) rpcproxy(oleaut32 oleaut32_oaidl.idl oleaut32_ocidl.idl) -add_livecd_target(oleaut32 reactos/system32) +add_cab_target(oleaut32 1) diff --git a/dll/win32/olecli32/CMakeLists.txt b/dll/win32/olecli32/CMakeLists.txt index 4ccde1d0577..b4b5942b1a4 100644 --- a/dll/win32/olecli32/CMakeLists.txt +++ b/dll/win32/olecli32/CMakeLists.txt @@ -14,4 +14,4 @@ target_link_libraries(olecli32 add_importlibs(olecli32 ole32 gdi32 kernel32 ntdll) add_dependencies(olecli32 olecli32_def psdk buildno_header) -add_livecd_target(olecli32 reactos/system32) \ No newline at end of file +add_cab_target(olecli32 1) \ No newline at end of file diff --git a/dll/win32/oledlg/CMakeLists.txt b/dll/win32/oledlg/CMakeLists.txt index 7eec53b10aa..4e88c64a05c 100644 --- a/dll/win32/oledlg/CMakeLists.txt +++ b/dll/win32/oledlg/CMakeLists.txt @@ -18,4 +18,4 @@ target_link_libraries(oledlg add_importlibs(oledlg ole32 comdlg32 user32 advapi32 kernel32 ntdll) add_dependencies(oledlg oledlg_def) -add_livecd_target(oledlg reactos/system32) +add_cab_target(oledlg 1) diff --git a/dll/win32/olepro32/CMakeLists.txt b/dll/win32/olepro32/CMakeLists.txt index a790aa469d1..2333055b30a 100644 --- a/dll/win32/olepro32/CMakeLists.txt +++ b/dll/win32/olepro32/CMakeLists.txt @@ -18,4 +18,4 @@ add_importlibs(olepro32 ntdll) add_dependencies(olepro32 olepro32_def) -add_livecd_target(olepro32 reactos/system32) \ No newline at end of file +add_cab_target(olepro32 1) \ No newline at end of file diff --git a/dll/win32/olesvr32/CMakeLists.txt b/dll/win32/olesvr32/CMakeLists.txt index eabc8e0fbcd..2ec6f562221 100644 --- a/dll/win32/olesvr32/CMakeLists.txt +++ b/dll/win32/olesvr32/CMakeLists.txt @@ -15,4 +15,4 @@ target_link_libraries(olesvr32 add_importlibs(olesvr32 kernel32 ntdll) add_dependencies(olesvr32 olesvr32_def psdk buildno_header) -add_livecd_target(olesvr32 reactos/system32) \ No newline at end of file +add_cab_target(olesvr32 1) \ No newline at end of file diff --git a/dll/win32/olethk32/CMakeLists.txt b/dll/win32/olethk32/CMakeLists.txt index efa94e8410e..7fdff46d3c8 100644 --- a/dll/win32/olethk32/CMakeLists.txt +++ b/dll/win32/olethk32/CMakeLists.txt @@ -14,4 +14,4 @@ target_link_libraries(olethk32 add_importlibs(olethk32 kernel32 ntdll) add_dependencies(olethk32 olethk32_def psdk) -add_livecd_target(olethk32 reactos/system32) +add_cab_target(olethk32 1) diff --git a/dll/win32/opengl32/CMakeLists.txt b/dll/win32/opengl32/CMakeLists.txt index f01d21b08fc..35a7f7bf8e4 100644 --- a/dll/win32/opengl32/CMakeLists.txt +++ b/dll/win32/opengl32/CMakeLists.txt @@ -31,4 +31,4 @@ add_importlibs(opengl32 add_pch(opengl32 ${CMAKE_CURRENT_SOURCE_DIR}/opengl32.h ${SOURCE}) add_dependencies(opengl32 opengl32_def) -add_livecd_target(opengl32 reactos/system32) +add_cab_target(opengl32 1) diff --git a/dll/win32/pdh/CMakeLists.txt b/dll/win32/pdh/CMakeLists.txt index d9897d6efbd..67a6b66fbb8 100644 --- a/dll/win32/pdh/CMakeLists.txt +++ b/dll/win32/pdh/CMakeLists.txt @@ -18,4 +18,4 @@ target_link_libraries(pdh add_importlibs(pdh kernel32 ntdll) add_dependencies(pdh pdh_def) -add_livecd_target(pdh reactos/system32) \ No newline at end of file +add_cab_target(pdh 1) \ No newline at end of file diff --git a/dll/win32/pidgen/CMakeLists.txt b/dll/win32/pidgen/CMakeLists.txt index dd46911ca8c..8aed702ef6b 100644 --- a/dll/win32/pidgen/CMakeLists.txt +++ b/dll/win32/pidgen/CMakeLists.txt @@ -14,4 +14,4 @@ target_link_libraries(pidgen add_importlibs(pidgen kernel32 ntdll) add_dependencies(pidgen pidgen_def) -add_livecd_target(pidgen reactos/system32) +add_cab_target(pidgen 1) diff --git a/dll/win32/powrprof/CMakeLists.txt b/dll/win32/powrprof/CMakeLists.txt index e0a7222f5b8..896e3bfb147 100644 --- a/dll/win32/powrprof/CMakeLists.txt +++ b/dll/win32/powrprof/CMakeLists.txt @@ -13,4 +13,4 @@ target_link_libraries(powrprof add_importlibs(powrprof advapi32 user32 comctl32 kernel32 ntdll) add_dependencies(powrprof powrprof_def) -add_livecd_target(powrprof reactos/system32) +add_cab_target(powrprof 1) diff --git a/dll/win32/printui/CMakeLists.txt b/dll/win32/printui/CMakeLists.txt index 5ebdf99a519..92d0294a18e 100644 --- a/dll/win32/printui/CMakeLists.txt +++ b/dll/win32/printui/CMakeLists.txt @@ -14,4 +14,4 @@ target_link_libraries(printui add_importlibs(printui shell32 kernel32 ntdll) add_dependencies(printui printui_def psdk buildno_header) -add_livecd_target(printui reactos/system32) \ No newline at end of file +add_cab_target(printui 1) \ No newline at end of file diff --git a/dll/win32/psapi/CMakeLists.txt b/dll/win32/psapi/CMakeLists.txt index 0ae4c6becfe..ffe0c612289 100644 --- a/dll/win32/psapi/CMakeLists.txt +++ b/dll/win32/psapi/CMakeLists.txt @@ -20,4 +20,4 @@ target_link_libraries(psapi add_importlibs(psapi kernel32 ntdll) add_pch(psapi ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) add_dependencies(psapi psapi_def) -add_livecd_target(psapi reactos/system32) +add_cab_target(psapi 1) diff --git a/dll/win32/pstorec/CMakeLists.txt b/dll/win32/pstorec/CMakeLists.txt index 61001f6b2c5..e41105ab025 100644 --- a/dll/win32/pstorec/CMakeLists.txt +++ b/dll/win32/pstorec/CMakeLists.txt @@ -18,4 +18,4 @@ target_link_libraries(pstorec add_importlibs(pstorec msvcrt kernel32 ntdll) add_dependencies(pstorec pstorec_tlb pstorec_def) -add_livecd_target(pstorec reactos/system32) +add_cab_target(pstorec 1) diff --git a/dll/win32/query/CMakeLists.txt b/dll/win32/query/CMakeLists.txt index 4682fcdddf4..17eb4bb55a6 100644 --- a/dll/win32/query/CMakeLists.txt +++ b/dll/win32/query/CMakeLists.txt @@ -15,4 +15,4 @@ target_link_libraries(query add_importlibs(query kernel32 ntdll) add_dependencies(query query_def) -add_livecd_target(query reactos/system32) +add_cab_target(query 1) diff --git a/dll/win32/rasadhlp/CMakeLists.txt b/dll/win32/rasadhlp/CMakeLists.txt index 091bbe1b7b8..1406a09973a 100644 --- a/dll/win32/rasadhlp/CMakeLists.txt +++ b/dll/win32/rasadhlp/CMakeLists.txt @@ -15,4 +15,4 @@ target_link_libraries(rasadhlp ${CMAKE_CURRENT_BINARY_DIR}/rasadhlp.def) add_importlibs(rasadhlp ws2_32 kernel32 ntdll) add_dependencies(rasadhlp rasadhlp_def) -add_livecd_target(rasadhlp reactos/system32) +add_cab_target(rasadhlp 1) diff --git a/dll/win32/rasapi32/CMakeLists.txt b/dll/win32/rasapi32/CMakeLists.txt index 00cc962b317..ebf4ad5b42b 100644 --- a/dll/win32/rasapi32/CMakeLists.txt +++ b/dll/win32/rasapi32/CMakeLists.txt @@ -14,4 +14,4 @@ target_link_libraries(rasapi32 add_importlibs(rasapi32 kernel32 ntdll) add_dependencies(rasapi32 rasapi32_def psdk buildno_header) -add_livecd_target(rasapi32 reactos/system32) \ No newline at end of file +add_cab_target(rasapi32 1) \ No newline at end of file diff --git a/dll/win32/rasdlg/CMakeLists.txt b/dll/win32/rasdlg/CMakeLists.txt index 5b224494f8e..4f14eb27656 100644 --- a/dll/win32/rasdlg/CMakeLists.txt +++ b/dll/win32/rasdlg/CMakeLists.txt @@ -12,4 +12,4 @@ target_link_libraries(rasdlg add_importlibs(rasdlg kernel32 ntdll) add_dependencies(rasdlg rasdlg_def) -add_livecd_target(rasdlg reactos/system32) +add_cab_target(rasdlg 1) diff --git a/dll/win32/rasman/CMakeLists.txt b/dll/win32/rasman/CMakeLists.txt index aaec332a810..f772f9b086d 100644 --- a/dll/win32/rasman/CMakeLists.txt +++ b/dll/win32/rasman/CMakeLists.txt @@ -12,4 +12,4 @@ target_link_libraries(rasman add_importlibs(rasman kernel32 ntdll) add_dependencies(rasman rasman_def) -add_livecd_target(rasman reactos/system32) +add_cab_target(rasman 1) diff --git a/dll/win32/resutils/CMakeLists.txt b/dll/win32/resutils/CMakeLists.txt index 5c09f36deaf..4a8bde739d5 100644 --- a/dll/win32/resutils/CMakeLists.txt +++ b/dll/win32/resutils/CMakeLists.txt @@ -14,4 +14,4 @@ target_link_libraries(resutils add_importlibs(resutils kernel32 ntdll) add_dependencies(resutils resutils_def) -add_livecd_target(resutils reactos/system32) +add_cab_target(resutils 1) diff --git a/dll/win32/riched20/CMakeLists.txt b/dll/win32/riched20/CMakeLists.txt index 627507e3544..a24c9b1c6d0 100644 --- a/dll/win32/riched20/CMakeLists.txt +++ b/dll/win32/riched20/CMakeLists.txt @@ -50,4 +50,4 @@ add_importlibs(riched20 ntdll) add_dependencies(riched20 riched20_def) -add_livecd_target(riched20 reactos/system32) +add_cab_target(riched20 1) diff --git a/dll/win32/riched32/CMakeLists.txt b/dll/win32/riched32/CMakeLists.txt index d62d8581677..456d4b35ee8 100644 --- a/dll/win32/riched32/CMakeLists.txt +++ b/dll/win32/riched32/CMakeLists.txt @@ -14,4 +14,4 @@ target_link_libraries(riched32 add_importlibs(riched32 riched20 user32 kernel32 ntdll) add_dependencies(riched32 riched32_def) -add_livecd_target(riched32 reactos/system32) +add_cab_target(riched32 1) diff --git a/dll/win32/rpcrt4/CMakeLists.txt b/dll/win32/rpcrt4/CMakeLists.txt index 4523907d11a..91064d1a20f 100644 --- a/dll/win32/rpcrt4/CMakeLists.txt +++ b/dll/win32/rpcrt4/CMakeLists.txt @@ -44,4 +44,4 @@ target_link_libraries(rpcrt4 add_importlibs(rpcrt4 msvcrt user32 advapi32 secur32 iphlpapi ws2_32 kernel32 ntdll) add_dependencies(rpcrt4 rpcrt4_def winesdk) -add_livecd_target(rpcrt4 reactos/system32) +add_cab_target(rpcrt4 1) diff --git a/dll/win32/rsabase/CMakeLists.txt b/dll/win32/rsabase/CMakeLists.txt index 89eb260222e..c2039b1f6a5 100644 --- a/dll/win32/rsabase/CMakeLists.txt +++ b/dll/win32/rsabase/CMakeLists.txt @@ -14,4 +14,4 @@ target_link_libraries(rsabase add_importlibs(rsabase rsaenh ntdll) add_dependencies(rsabase rsabase_def) -add_livecd_target(rsabase reactos/system32) \ No newline at end of file +add_cab_target(rsabase 1) \ No newline at end of file diff --git a/dll/win32/rsaenh/CMakeLists.txt b/dll/win32/rsaenh/CMakeLists.txt index d5ae0ae8e94..dc1bc82008d 100644 --- a/dll/win32/rsaenh/CMakeLists.txt +++ b/dll/win32/rsaenh/CMakeLists.txt @@ -29,4 +29,4 @@ target_link_libraries(rsaenh add_importlibs(rsaenh msvcrt crypt32 advapi32 kernel32 ntdll) add_dependencies(rsaenh rsaenh_def) -add_livecd_target(rsaenh reactos/system32) +add_cab_target(rsaenh 1) diff --git a/dll/win32/samlib/CMakeLists.txt b/dll/win32/samlib/CMakeLists.txt index c0343f62194..930f9fbc85f 100644 --- a/dll/win32/samlib/CMakeLists.txt +++ b/dll/win32/samlib/CMakeLists.txt @@ -12,4 +12,4 @@ target_link_libraries(samlib ${CMAKE_CURRENT_BINARY_DIR}/samlib.def) add_importlibs(samlib advapi32 kernel32 ntdll) add_dependencies(samlib samlib_def) -add_livecd_target(samlib reactos/system32) +add_cab_target(samlib 1) diff --git a/dll/win32/sccbase/CMakeLists.txt b/dll/win32/sccbase/CMakeLists.txt index 08905ef373b..8e4faf13e22 100644 --- a/dll/win32/sccbase/CMakeLists.txt +++ b/dll/win32/sccbase/CMakeLists.txt @@ -14,4 +14,4 @@ target_link_libraries(sccbase add_importlibs(sccbase kernel32 ntdll) add_dependencies(sccbase sccbase_def) -add_livecd_target(sccbase reactos/system32) +add_cab_target(sccbase 1) diff --git a/dll/win32/schannel/CMakeLists.txt b/dll/win32/schannel/CMakeLists.txt index 01bd0946e80..5de30f15995 100644 --- a/dll/win32/schannel/CMakeLists.txt +++ b/dll/win32/schannel/CMakeLists.txt @@ -18,4 +18,4 @@ target_link_libraries(schannel add_importlibs(schannel secur32 kernel32 ntdll) add_dependencies(schannel schannel_def) -add_livecd_target(schannel reactos/system32) +add_cab_target(schannel 1) diff --git a/dll/win32/secur32/CMakeLists.txt b/dll/win32/secur32/CMakeLists.txt index ea38c3759e7..2b4100cdc0c 100644 --- a/dll/win32/secur32/CMakeLists.txt +++ b/dll/win32/secur32/CMakeLists.txt @@ -23,4 +23,4 @@ target_link_libraries(secur32 add_importlibs(secur32 advapi32 kernel32 ntdll) add_pch(secur32 ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) add_dependencies(secur32 secur32_def) -add_livecd_target(secur32 reactos/system32) +add_cab_target(secur32 1) diff --git a/dll/win32/sensapi/CMakeLists.txt b/dll/win32/sensapi/CMakeLists.txt index 51a8714d396..594f8e60049 100644 --- a/dll/win32/sensapi/CMakeLists.txt +++ b/dll/win32/sensapi/CMakeLists.txt @@ -14,4 +14,4 @@ target_link_libraries(sensapi add_importlibs(sensapi kernel32 ntdll) add_dependencies(sensapi sensapi_def) -add_livecd_target(sensapi reactos/system32) +add_cab_target(sensapi 1) diff --git a/dll/win32/serialui/CMakeLists.txt b/dll/win32/serialui/CMakeLists.txt index 8b6b6d48bec..501d2340186 100644 --- a/dll/win32/serialui/CMakeLists.txt +++ b/dll/win32/serialui/CMakeLists.txt @@ -11,4 +11,4 @@ target_link_libraries(serialui ${CMAKE_CURRENT_BINARY_DIR}/serialui.def) add_importlibs(serialui user32 shlwapi kernel32) add_dependencies(serialui serialui_def) -add_livecd_target(serialui reactos/system32) +add_cab_target(serialui 1) diff --git a/dll/win32/setupapi/CMakeLists.txt b/dll/win32/setupapi/CMakeLists.txt index ba83ce58b01..cbcfe3e5bd5 100644 --- a/dll/win32/setupapi/CMakeLists.txt +++ b/dll/win32/setupapi/CMakeLists.txt @@ -55,4 +55,4 @@ add_importlibs(setupapi ntdll) add_dependencies(setupapi setupapi_def) -add_livecd_target(setupapi reactos/system32) +add_cab_target(setupapi 1) diff --git a/dll/win32/sfc/CMakeLists.txt b/dll/win32/sfc/CMakeLists.txt index c4ca65084c5..548216fd19d 100644 --- a/dll/win32/sfc/CMakeLists.txt +++ b/dll/win32/sfc/CMakeLists.txt @@ -14,4 +14,4 @@ target_link_libraries(sfc ${CMAKE_CURRENT_BINARY_DIR}/sfc.def) add_importlibs(sfc kernel32) add_pch(sfc ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) add_dependencies(sfc sfc_def) -add_livecd_target(sfc reactos/system32) +add_cab_target(sfc 1) diff --git a/dll/win32/sfc_os/CMakeLists.txt b/dll/win32/sfc_os/CMakeLists.txt index 62a912204bf..0d3c909cfde 100644 --- a/dll/win32/sfc_os/CMakeLists.txt +++ b/dll/win32/sfc_os/CMakeLists.txt @@ -14,4 +14,4 @@ target_link_libraries(sfc_os ${CMAKE_CURRENT_BINARY_DIR}/sfc_os.def) add_importlibs(sfc_os kernel32 ntdll) add_pch(sfc_os ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) add_dependencies(sfc_os sfc_os_def) -add_livecd_target(sfc_os reactos/system32) +add_cab_target(sfc_os 1) diff --git a/dll/win32/shdocvw/CMakeLists.txt b/dll/win32/shdocvw/CMakeLists.txt index df5e09a812a..d7760882cfc 100644 --- a/dll/win32/shdocvw/CMakeLists.txt +++ b/dll/win32/shdocvw/CMakeLists.txt @@ -50,4 +50,4 @@ add_importlibs(shdocvw ntdll) add_dependencies(shdocvw shdocvw_v1 shdocvw_def) -add_livecd_target(shdocvw reactos/system32) +add_cab_target(shdocvw 1) diff --git a/dll/win32/shell32/CMakeLists.txt b/dll/win32/shell32/CMakeLists.txt index 1b9386dbc07..c42fc28a869 100644 --- a/dll/win32/shell32/CMakeLists.txt +++ b/dll/win32/shell32/CMakeLists.txt @@ -94,4 +94,4 @@ add_importlibs(shell32 ntdll) add_dependencies(shell32 shell32_def) -add_livecd_target(shell32 reactos/system32) \ No newline at end of file +add_cab_target(shell32 1) \ No newline at end of file diff --git a/dll/win32/shimgvw/CMakeLists.txt b/dll/win32/shimgvw/CMakeLists.txt index dc4a42b7fc9..226efaa5e92 100644 --- a/dll/win32/shimgvw/CMakeLists.txt +++ b/dll/win32/shimgvw/CMakeLists.txt @@ -19,4 +19,4 @@ add_importlibs(shimgvw ntdll) add_dependencies(shimgvw shimgvw_def) -add_livecd_target(shimgvw reactos/system32) +add_cab_target(shimgvw 1) diff --git a/dll/win32/shlwapi/CMakeLists.txt b/dll/win32/shlwapi/CMakeLists.txt index 43366dfc083..e45e232d1a9 100644 --- a/dll/win32/shlwapi/CMakeLists.txt +++ b/dll/win32/shlwapi/CMakeLists.txt @@ -49,4 +49,4 @@ add_importlibs(shlwapi ntdll) add_dependencies(shlwapi shlwapi_def) -add_livecd_target(shlwapi reactos/system32) +add_cab_target(shlwapi 1) diff --git a/dll/win32/slbcsp/CMakeLists.txt b/dll/win32/slbcsp/CMakeLists.txt index bcbda6b62f0..ec50a8a2011 100644 --- a/dll/win32/slbcsp/CMakeLists.txt +++ b/dll/win32/slbcsp/CMakeLists.txt @@ -14,4 +14,4 @@ target_link_libraries(slbcsp add_importlibs(slbcsp kernel32 ntdll) add_dependencies(slbcsp slbcsp_def) -add_livecd_target(slbcsp reactos/system32) +add_cab_target(slbcsp 1) diff --git a/dll/win32/smdll/CMakeLists.txt b/dll/win32/smdll/CMakeLists.txt index e5bf69f1401..45a8f4df873 100644 --- a/dll/win32/smdll/CMakeLists.txt +++ b/dll/win32/smdll/CMakeLists.txt @@ -14,4 +14,4 @@ target_link_libraries(smdll add_importlibs(smdll ntdll) add_dependencies(smdll smdll_def psdk buildno_header) -add_livecd_target(smdll reactos/system32) \ No newline at end of file +add_cab_target(smdll 1) \ No newline at end of file diff --git a/dll/win32/sndblst/CMakeLists.txt b/dll/win32/sndblst/CMakeLists.txt index 451339b0d90..f38bd51b2bc 100644 --- a/dll/win32/sndblst/CMakeLists.txt +++ b/dll/win32/sndblst/CMakeLists.txt @@ -17,4 +17,4 @@ target_link_libraries(sndblst add_importlibs(sndblst user32 winmm advapi32 kernel32 ntdll) add_dependencies(sndblst sndblst_def) -add_livecd_target(sndblst reactos/system32) +add_cab_target(sndblst 1) diff --git a/dll/win32/snmpapi/CMakeLists.txt b/dll/win32/snmpapi/CMakeLists.txt index 735ae05f212..bc4df214f9f 100644 --- a/dll/win32/snmpapi/CMakeLists.txt +++ b/dll/win32/snmpapi/CMakeLists.txt @@ -17,4 +17,4 @@ target_link_libraries(snmpapi add_importlibs(snmpapi kernel32 ntdll) add_dependencies(snmpapi snmpapi_def) -add_livecd_target(snmpapi reactos/system32) +add_cab_target(snmpapi 1) diff --git a/dll/win32/spoolss/CMakeLists.txt b/dll/win32/spoolss/CMakeLists.txt index a0fd8bb6b1c..ad3c022854d 100644 --- a/dll/win32/spoolss/CMakeLists.txt +++ b/dll/win32/spoolss/CMakeLists.txt @@ -14,4 +14,4 @@ target_link_libraries(spoolss add_importlibs(spoolss winspool kernel32 ntdll) add_dependencies(spoolss spoolss_def) -add_livecd_target(spoolss reactos/system32) +add_cab_target(spoolss 1) diff --git a/dll/win32/stdole2.tlb/CMakeLists.txt b/dll/win32/stdole2.tlb/CMakeLists.txt index bc66c3dcf67..7ef21a52b2c 100644 --- a/dll/win32/stdole2.tlb/CMakeLists.txt +++ b/dll/win32/stdole2.tlb/CMakeLists.txt @@ -20,4 +20,4 @@ set_target_properties(stdole2.tlb PROPERTIES SUFFIX "") target_link_libraries(stdole2.tlb ${CMAKE_CURRENT_BINARY_DIR}/stdole2.tlb.def) add_dependencies(stdole2.tlb std_ole_v2 stdole2.tlb_def) -add_livecd_target(stdole2.tlb reactos/system32) +add_cab_target(stdole2.tlb 1) diff --git a/dll/win32/stdole32.tlb/CMakeLists.txt b/dll/win32/stdole32.tlb/CMakeLists.txt index dec89c31b5c..749d2a42b88 100644 --- a/dll/win32/stdole32.tlb/CMakeLists.txt +++ b/dll/win32/stdole32.tlb/CMakeLists.txt @@ -20,4 +20,4 @@ set_target_properties(stdole32.tlb PROPERTIES SUFFIX "") target_link_libraries(stdole32.tlb ${CMAKE_CURRENT_BINARY_DIR}/stdole32.tlb.def) add_dependencies(stdole32.tlb std_ole_v1 stdole32.tlb_def) -add_livecd_target(stdole32.tlb reactos/system32) +add_cab_target(stdole32.tlb 1) diff --git a/dll/win32/sti/CMakeLists.txt b/dll/win32/sti/CMakeLists.txt index e0b7a476b68..dd7e8e72ebe 100644 --- a/dll/win32/sti/CMakeLists.txt +++ b/dll/win32/sti/CMakeLists.txt @@ -38,4 +38,4 @@ add_importlibs(sti add_dependencies(sti sti_def) rpcproxy(sti sti_wia.idl) -add_livecd_target(sti reactos/system32) +add_cab_target(sti 1) diff --git a/dll/win32/syssetup/CMakeLists.txt b/dll/win32/syssetup/CMakeLists.txt index da97bf7277d..e98a5519d29 100644 --- a/dll/win32/syssetup/CMakeLists.txt +++ b/dll/win32/syssetup/CMakeLists.txt @@ -36,4 +36,4 @@ add_importlibs(syssetup ntdll) add_dependencies(syssetup syssetup_def) -add_livecd_target(syssetup reactos/system32) +add_cab_target(syssetup 1) diff --git a/dll/win32/t2embed/CMakeLists.txt b/dll/win32/t2embed/CMakeLists.txt index f114553d0f2..f0a9992effe 100644 --- a/dll/win32/t2embed/CMakeLists.txt +++ b/dll/win32/t2embed/CMakeLists.txt @@ -16,4 +16,4 @@ target_link_libraries(t2embed add_importlibs(t2embed gdi32 user32 advapi32 version kernel32 ntdll) add_dependencies(t2embed t2embed_def) -add_livecd_target(t2embed reactos/system32) +add_cab_target(t2embed 1) diff --git a/dll/win32/traffic/CMakeLists.txt b/dll/win32/traffic/CMakeLists.txt index e0b1732f55b..269f85966f8 100644 --- a/dll/win32/traffic/CMakeLists.txt +++ b/dll/win32/traffic/CMakeLists.txt @@ -14,4 +14,4 @@ target_link_libraries(traffic add_importlibs(traffic kernel32 ntdll) add_dependencies(traffic traffic_def psdk buildno_header) -add_livecd_target(traffic reactos/system32) +add_cab_target(traffic 1) diff --git a/dll/win32/twain_32/CMakeLists.txt b/dll/win32/twain_32/CMakeLists.txt index 2cd0d615583..66fc4f803b8 100644 --- a/dll/win32/twain_32/CMakeLists.txt +++ b/dll/win32/twain_32/CMakeLists.txt @@ -20,4 +20,4 @@ target_link_libraries(twain_32 add_importlibs(twain_32 msvcrt kernel32 ntdll) add_dependencies(twain_32 twain_32_def) -add_livecd_target(twain_32 reactos/system32) +add_cab_target(twain_32 1) diff --git a/dll/win32/uext2/CMakeLists.txt b/dll/win32/uext2/CMakeLists.txt index ab1d402920e..dcfbc298a9f 100644 --- a/dll/win32/uext2/CMakeLists.txt +++ b/dll/win32/uext2/CMakeLists.txt @@ -11,4 +11,4 @@ target_link_libraries(uext2 add_importlibs(uext2 kernel32 ntdll) add_dependencies(uext2 uext2_def) -add_livecd_target(uext2 reactos/system32) +add_cab_target(uext2 1) diff --git a/dll/win32/ufat/CMakeLists.txt b/dll/win32/ufat/CMakeLists.txt index d1e5f94af5e..5ec69654775 100644 --- a/dll/win32/ufat/CMakeLists.txt +++ b/dll/win32/ufat/CMakeLists.txt @@ -11,4 +11,4 @@ target_link_libraries(ufat add_importlibs(ufat kernel32 ntdll) add_dependencies(ufat ufat_def) -add_livecd_target(ufat reactos/system32) +add_cab_target(ufat 1) diff --git a/dll/win32/ufatx/CMakeLists.txt b/dll/win32/ufatx/CMakeLists.txt index b6c32fec073..b091691e7a0 100644 --- a/dll/win32/ufatx/CMakeLists.txt +++ b/dll/win32/ufatx/CMakeLists.txt @@ -11,4 +11,4 @@ target_link_libraries(ufatx add_importlibs(ufatx gcc kernel32 ntdll) add_dependencies(ufatx ufatx_def psdk buildno_header) -add_livecd_target(ufatx reactos/system32) \ No newline at end of file +add_cab_target(ufatx 1) \ No newline at end of file diff --git a/dll/win32/untfs/CMakeLists.txt b/dll/win32/untfs/CMakeLists.txt index 26f8dc9c9a8..e74cf66cdcf 100644 --- a/dll/win32/untfs/CMakeLists.txt +++ b/dll/win32/untfs/CMakeLists.txt @@ -11,4 +11,4 @@ target_link_libraries(untfs add_importlibs(untfs kernel32 ntdll) add_dependencies(untfs untfs_def) -add_livecd_target(untfs reactos/system32) +add_cab_target(untfs 1) diff --git a/dll/win32/url/CMakeLists.txt b/dll/win32/url/CMakeLists.txt index 46c2e7baba0..85da3558d39 100644 --- a/dll/win32/url/CMakeLists.txt +++ b/dll/win32/url/CMakeLists.txt @@ -14,4 +14,4 @@ target_link_libraries(url add_importlibs(url shell32 shlwapi kernel32 ntdll) add_dependencies(url url_def) -add_livecd_target(url reactos/system32) +add_cab_target(url 1) diff --git a/dll/win32/urlmon/CMakeLists.txt b/dll/win32/urlmon/CMakeLists.txt index b5bf0cff06a..82f59c47583 100644 --- a/dll/win32/urlmon/CMakeLists.txt +++ b/dll/win32/urlmon/CMakeLists.txt @@ -65,4 +65,4 @@ add_definitions(-DPROXY_CLSID_IS={0x79EAC9F1,0xBAF9,0x11CE,{0x8C,0x82,0x00,0xAA, #add_definitions(-DPROXY_CLSID_IS="{0x79EAC9F1,0xBAF9,0x11CE,{0x8C,0x82,0x00,0xAA,0x00,0x4B,0xA9,0x0B}}") rpcproxy(urlmon urlmon_urlmon.idl) -add_livecd_target(urlmon reactos/system32) +add_cab_target(urlmon 1) diff --git a/dll/win32/user32/CMakeLists.txt b/dll/win32/user32/CMakeLists.txt index 2fb3d3abd15..8badd7972cd 100644 --- a/dll/win32/user32/CMakeLists.txt +++ b/dll/win32/user32/CMakeLists.txt @@ -79,4 +79,4 @@ target_link_libraries(user32 add_pch(user32 ${CMAKE_CURRENT_SOURCE_DIR}/include/user32.h ${SOURCE}) add_importlibs(user32 gdi32 advapi32 imm32 kernel32 ntdll) -add_livecd_target(user32 reactos/system32) +add_cab_target(user32 1) diff --git a/dll/win32/userenv/CMakeLists.txt b/dll/win32/userenv/CMakeLists.txt index 0d333dcef09..a31e9c5cc22 100644 --- a/dll/win32/userenv/CMakeLists.txt +++ b/dll/win32/userenv/CMakeLists.txt @@ -26,4 +26,4 @@ target_link_libraries(userenv add_importlibs(userenv advapi32 user32 kernel32 ntdll) add_pch(userenv ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) add_dependencies(userenv userenv_def) -add_livecd_target(userenv reactos/system32) +add_cab_target(userenv 1) diff --git a/dll/win32/usp10/CMakeLists.txt b/dll/win32/usp10/CMakeLists.txt index b4af94b1b02..8ccf002363f 100644 --- a/dll/win32/usp10/CMakeLists.txt +++ b/dll/win32/usp10/CMakeLists.txt @@ -19,4 +19,4 @@ target_link_libraries(usp10 add_importlibs(usp10 gdi32 kernel32 ntdll) add_dependencies(usp10 usp10_def) -add_livecd_target(usp10 reactos/system32) +add_cab_target(usp10 1) diff --git a/dll/win32/uxtheme/CMakeLists.txt b/dll/win32/uxtheme/CMakeLists.txt index 78cf67cb371..dc2f05a210d 100644 --- a/dll/win32/uxtheme/CMakeLists.txt +++ b/dll/win32/uxtheme/CMakeLists.txt @@ -24,4 +24,4 @@ target_link_libraries(uxtheme add_importlibs(uxtheme user32 advapi32 gdi32 msimg32 kernel32 ntdll) add_dependencies(uxtheme uxtheme_def) -add_livecd_target(uxtheme reactos/system32) +add_cab_target(uxtheme 1) diff --git a/dll/win32/vdmdbg/CMakeLists.txt b/dll/win32/vdmdbg/CMakeLists.txt index 1748d91e057..94d87a4cfed 100644 --- a/dll/win32/vdmdbg/CMakeLists.txt +++ b/dll/win32/vdmdbg/CMakeLists.txt @@ -16,4 +16,4 @@ target_link_libraries(vdmdbg ${CMAKE_CURRENT_BINARY_DIR}/vdmdbg.def) add_importlibs(vdmdbg kernel32 ntdll) add_pch(vdmdbg ${CMAKE_CURRENT_SOURCE_DIR}/vdmdbg.h ${SOURCE}) add_dependencies(vdmdbg vdmdbg_def) -add_livecd_target(vdmdbg reactos/system32) +add_cab_target(vdmdbg 1) diff --git a/dll/win32/version/CMakeLists.txt b/dll/win32/version/CMakeLists.txt index b6b0eaa357b..2d096d917fe 100644 --- a/dll/win32/version/CMakeLists.txt +++ b/dll/win32/version/CMakeLists.txt @@ -18,4 +18,4 @@ target_link_libraries(version add_importlibs(version lz32 kernel32 ntdll) add_dependencies(version version_def psdk buildno_header) -add_livecd_target(version reactos/system32) \ No newline at end of file +add_cab_target(version 1) \ No newline at end of file diff --git a/dll/win32/windowscodecs/CMakeLists.txt b/dll/win32/windowscodecs/CMakeLists.txt index 9cf2cc0da5f..71870612490 100644 --- a/dll/win32/windowscodecs/CMakeLists.txt +++ b/dll/win32/windowscodecs/CMakeLists.txt @@ -42,4 +42,4 @@ target_link_libraries(windowscodecs add_importlibs(windowscodecs uuid ole32 shlwapi advapi32 msvcrt kernel32 ntdll) add_dependencies(windowscodecs windowscodecs_def) -add_livecd_target(windowscodecs reactos/system32) +add_cab_target(windowscodecs 1) diff --git a/dll/win32/winhttp/CMakeLists.txt b/dll/win32/winhttp/CMakeLists.txt index d668f706efe..2b515eed56d 100644 --- a/dll/win32/winhttp/CMakeLists.txt +++ b/dll/win32/winhttp/CMakeLists.txt @@ -21,4 +21,4 @@ target_link_libraries(winhttp add_importlibs(winhttp shlwapi wininet ws2_32 msvcrt crypt32 advapi32 kernel32 ntdll) add_dependencies(winhttp winhttp_def) -add_livecd_target(winhttp reactos/system32) +add_cab_target(winhttp 1) diff --git a/dll/win32/wininet/CMakeLists.txt b/dll/win32/wininet/CMakeLists.txt index 455c91f9b4b..fc4489ac78e 100644 --- a/dll/win32/wininet/CMakeLists.txt +++ b/dll/win32/wininet/CMakeLists.txt @@ -34,4 +34,4 @@ target_link_libraries(wininet add_importlibs(wininet mpr shlwapi shell32 user32 advapi32 secur32 crypt32 ws2_32 msvcrt kernel32 ntdll) add_dependencies(wininet wininet_def) -add_livecd_target(wininet reactos/system32) +add_cab_target(wininet 1) diff --git a/dll/win32/winmm/CMakeLists.txt b/dll/win32/winmm/CMakeLists.txt index da1ef004e1c..09407c784dc 100644 --- a/dll/win32/winmm/CMakeLists.txt +++ b/dll/win32/winmm/CMakeLists.txt @@ -29,4 +29,4 @@ add_importlibs(winmm advapi32 user32 msvcrt kernel32 ntdll) add_dependencies(winmm winmm_def) add_subdirectory(midimap) -add_livecd_target(winmm reactos/system32) +add_cab_target(winmm 1) diff --git a/dll/win32/winmm/midimap/CMakeLists.txt b/dll/win32/winmm/midimap/CMakeLists.txt index e1561dc942b..540606361a9 100644 --- a/dll/win32/winmm/midimap/CMakeLists.txt +++ b/dll/win32/winmm/midimap/CMakeLists.txt @@ -13,4 +13,4 @@ target_link_libraries(midimap add_importlibs(midimap kernel32 uuid ntdll advapi32 user32 winmm) add_dependencies(midimap midimap_def psdk) -add_livecd_target(midimap reactos/system32) \ No newline at end of file +add_cab_target(midimap 1) \ No newline at end of file diff --git a/dll/win32/winspool/CMakeLists.txt b/dll/win32/winspool/CMakeLists.txt index d3c7fa419f8..b5460427c9b 100644 --- a/dll/win32/winspool/CMakeLists.txt +++ b/dll/win32/winspool/CMakeLists.txt @@ -18,4 +18,4 @@ target_link_libraries(winspool add_importlibs(winspool advapi32 shlwapi kernel32 ntdll) add_dependencies(winspool winspool_def) -add_livecd_target(winspool reactos/system32) +add_cab_target(winspool 1) diff --git a/dll/win32/winsta/CMakeLists.txt b/dll/win32/winsta/CMakeLists.txt index fce7f8fed19..7fdb222b2ec 100644 --- a/dll/win32/winsta/CMakeLists.txt +++ b/dll/win32/winsta/CMakeLists.txt @@ -24,4 +24,4 @@ target_link_libraries(winsta add_importlibs(winsta kernel32 ntdll) add_pch(winsta ${CMAKE_CURRENT_SOURCE_DIR}/winsta.h ${SOURCE}) add_dependencies(winsta winsta_def) -add_livecd_target(winsta reactos/system32) +add_cab_target(winsta 1) diff --git a/dll/win32/wintrust/CMakeLists.txt b/dll/win32/wintrust/CMakeLists.txt index 772f350bf6c..2854b8a1ee5 100644 --- a/dll/win32/wintrust/CMakeLists.txt +++ b/dll/win32/wintrust/CMakeLists.txt @@ -21,4 +21,4 @@ target_link_libraries(wintrust add_importlibs(wintrust crypt32 cryptui user32 advapi32 imagehlp msvcrt kernel32 ntdll) add_dependencies(wintrust wintrust_def) -add_livecd_target(wintrust reactos/system32) +add_cab_target(wintrust 1) diff --git a/dll/win32/wldap32/CMakeLists.txt b/dll/win32/wldap32/CMakeLists.txt index b1b9c351807..a3b5f1021fe 100644 --- a/dll/win32/wldap32/CMakeLists.txt +++ b/dll/win32/wldap32/CMakeLists.txt @@ -35,4 +35,4 @@ target_link_libraries(wldap32 add_importlibs(wldap32 user32 kernel32 ntdll) add_dependencies(wldap32 wldap32_def) -add_livecd_target(wldap32 reactos/system32) +add_cab_target(wldap32 1) diff --git a/dll/win32/ws2_32/CMakeLists.txt b/dll/win32/ws2_32/CMakeLists.txt index c42327a6a04..2cd7170d73e 100644 --- a/dll/win32/ws2_32/CMakeLists.txt +++ b/dll/win32/ws2_32/CMakeLists.txt @@ -33,4 +33,4 @@ target_link_libraries(ws2_32 add_importlibs(ws2_32 user32 advapi32 dnsapi ws2help kernel32 ntdll) add_pch(ws2_32 ${CMAKE_CURRENT_SOURCE_DIR}/include/ws2_32.h ${SOURCE}) add_dependencies(ws2_32 ws2_32_def) -add_livecd_target(ws2_32 reactos/system32) +add_cab_target(ws2_32 1) diff --git a/dll/win32/ws2_32_new/CMakeLists.txt b/dll/win32/ws2_32_new/CMakeLists.txt index 569e03d2d5c..0f67f446edb 100644 --- a/dll/win32/ws2_32_new/CMakeLists.txt +++ b/dll/win32/ws2_32_new/CMakeLists.txt @@ -53,4 +53,4 @@ target_link_libraries(ws2_32_new add_importlibs(ws2_32_new user32 advapi32 dnsapi ws2help kernel32 ntdll) add_dependencies(ws2_32_new ws2_32_new_def) -add_livecd_target(ws2_32_new reactos/system32) +add_cab_target(ws2_32_new 1) diff --git a/dll/win32/ws2help/CMakeLists.txt b/dll/win32/ws2help/CMakeLists.txt index 2dee2360b72..6845a542d76 100644 --- a/dll/win32/ws2help/CMakeLists.txt +++ b/dll/win32/ws2help/CMakeLists.txt @@ -15,4 +15,4 @@ set_module_type(ws2help win32dll) target_link_libraries(ws2help ${CMAKE_CURRENT_BINARY_DIR}/ws2help.def) add_importlibs(ws2help advapi32 ws2_32 kernel32 ntdll) add_dependencies(ws2help ws2help_def) -add_livecd_target(ws2help reactos/system32) +add_cab_target(ws2help 1) diff --git a/dll/win32/wshirda/CMakeLists.txt b/dll/win32/wshirda/CMakeLists.txt index 7c9f59c13a9..b2442c62f83 100644 --- a/dll/win32/wshirda/CMakeLists.txt +++ b/dll/win32/wshirda/CMakeLists.txt @@ -10,4 +10,4 @@ set_module_type(wshirda win32dll) target_link_libraries(wshirda ${CMAKE_CURRENT_BINARY_DIR}/wshirda.def) add_importlibs(wshirda ws2_32 kernel32 ntdll) add_dependencies(wshirda wshirda_def) -add_livecd_target(wshirda reactos/system32) +add_cab_target(wshirda 1) diff --git a/dll/win32/wsock32/CMakeLists.txt b/dll/win32/wsock32/CMakeLists.txt index 43ae8afe827..2975c0f534e 100644 --- a/dll/win32/wsock32/CMakeLists.txt +++ b/dll/win32/wsock32/CMakeLists.txt @@ -7,4 +7,4 @@ set_module_type(wsock32 win32dll) target_link_libraries(wsock32 ${CMAKE_CURRENT_SOURCE_DIR}/wsock32.def) add_importlibs(wsock32 ws2_32 kernel32 ntdll) -add_livecd_target(wsock32 reactos/system32) +add_cab_target(wsock32 1) diff --git a/dll/win32/wtsapi32/CMakeLists.txt b/dll/win32/wtsapi32/CMakeLists.txt index f59373c317f..06066c10a64 100644 --- a/dll/win32/wtsapi32/CMakeLists.txt +++ b/dll/win32/wtsapi32/CMakeLists.txt @@ -14,4 +14,4 @@ target_link_libraries(wtsapi32 add_importlibs(wtsapi32 advapi32 kernel32 ntdll) add_dependencies(wtsapi32 wtsapi32_def) -add_livecd_target(wtsapi32 reactos/system32) +add_cab_target(wtsapi32 1) diff --git a/dll/win32/wuapi/CMakeLists.txt b/dll/win32/wuapi/CMakeLists.txt index 3d6809f79b7..795b9b66e55 100644 --- a/dll/win32/wuapi/CMakeLists.txt +++ b/dll/win32/wuapi/CMakeLists.txt @@ -26,4 +26,4 @@ target_link_libraries(wuapi add_importlibs(wuapi ole32 advapi32 kernel32 ntdll) add_dependencies(wuapi wuapi_def) -add_livecd_target(wuapi reactos/system32) +add_cab_target(wuapi 1) diff --git a/dll/win32/xinput1_1/CMakeLists.txt b/dll/win32/xinput1_1/CMakeLists.txt index d6d1ca79cf9..8e30fdb3baf 100644 --- a/dll/win32/xinput1_1/CMakeLists.txt +++ b/dll/win32/xinput1_1/CMakeLists.txt @@ -11,4 +11,4 @@ set_module_type(xinput1_1 win32dll) target_link_libraries(xinput1_1 ${CMAKE_CURRENT_BINARY_DIR}/xinput1_1.def) add_importlibs(xinput1_1 kernel32) add_dependencies(xinput1_1 xinput1_1_def) -add_livecd_target(xinput1_1 reactos/system32) +add_cab_target(xinput1_1 1) diff --git a/dll/win32/xinput1_2/CMakeLists.txt b/dll/win32/xinput1_2/CMakeLists.txt index 2f985923ec3..04084156c42 100644 --- a/dll/win32/xinput1_2/CMakeLists.txt +++ b/dll/win32/xinput1_2/CMakeLists.txt @@ -11,4 +11,4 @@ add_importlibs(xinput1_2 kernel32) set_module_type(xinput1_2 win32dll) target_link_libraries(xinput1_2 ${CMAKE_CURRENT_BINARY_DIR}/xinput1_2.def) add_dependencies(xinput1_2 xinput1_2_def) -add_livecd_target(xinput1_2 reactos/system32) +add_cab_target(xinput1_2 1) diff --git a/dll/win32/xinput1_3/CMakeLists.txt b/dll/win32/xinput1_3/CMakeLists.txt index ad161ef479a..34d5118f01d 100644 --- a/dll/win32/xinput1_3/CMakeLists.txt +++ b/dll/win32/xinput1_3/CMakeLists.txt @@ -15,4 +15,4 @@ target_link_libraries(xinput1_3 add_importlibs(xinput1_3 msvcrt kernel32 ntdll) add_dependencies(xinput1_3 xinput1_3_def) -add_livecd_target(xinput1_3 reactos/system32) +add_cab_target(xinput1_3 1) diff --git a/dll/win32/xinput9_1_0/CMakeLists.txt b/dll/win32/xinput9_1_0/CMakeLists.txt index edee3c3c523..02abe3ba906 100644 --- a/dll/win32/xinput9_1_0/CMakeLists.txt +++ b/dll/win32/xinput9_1_0/CMakeLists.txt @@ -11,4 +11,4 @@ add_importlibs(xinput9_1_0 kernel32) set_module_type(xinput9_1_0 win32dll) target_link_libraries(xinput9_1_0 ${CMAKE_CURRENT_BINARY_DIR}/xinput9_1_0.def) add_dependencies(xinput9_1_0 xinput9_1_0_def) -add_livecd_target(xinput9_1_0 reactos/system32) +add_cab_target(xinput9_1_0 1) diff --git a/dll/win32/xmllite/CMakeLists.txt b/dll/win32/xmllite/CMakeLists.txt index f94df56f5f2..e37f6f7b791 100644 --- a/dll/win32/xmllite/CMakeLists.txt +++ b/dll/win32/xmllite/CMakeLists.txt @@ -15,4 +15,4 @@ target_link_libraries(xmllite add_importlibs(xmllite kernel32 ntdll) add_dependencies(xmllite xmllite_def) -add_livecd_target(xmllite reactos/system32) +add_cab_target(xmllite 1) diff --git a/drivers/base/beep/CMakeLists.txt b/drivers/base/beep/CMakeLists.txt index ca5ecbcafce..d2ed77cf4d3 100644 --- a/drivers/base/beep/CMakeLists.txt +++ b/drivers/base/beep/CMakeLists.txt @@ -10,4 +10,4 @@ target_link_libraries(beep -lhal) add_dependencies(beep psdk bugcodes) -add_livecd_target(beep reactos/system32/drivers) \ No newline at end of file +add_cab_target(beep 2) \ No newline at end of file diff --git a/drivers/base/bootvid/CMakeLists.txt b/drivers/base/bootvid/CMakeLists.txt index 33b67af6661..7a9b0eedb43 100644 --- a/drivers/base/bootvid/CMakeLists.txt +++ b/drivers/base/bootvid/CMakeLists.txt @@ -28,4 +28,4 @@ target_link_libraries(bootvid add_pch(bootvid ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) add_dependencies(bootvid bootvid_def psdk buildno_header bugcodes) add_minicd_target(bootvid reactos bootvid.dll) -add_livecd_target(bootvid reactos/system32) \ No newline at end of file +add_minicd_target(bootvid reactos/system32) \ No newline at end of file diff --git a/drivers/base/nmidebug/CMakeLists.txt b/drivers/base/nmidebug/CMakeLists.txt index bc903c35579..19041827627 100644 --- a/drivers/base/nmidebug/CMakeLists.txt +++ b/drivers/base/nmidebug/CMakeLists.txt @@ -10,4 +10,5 @@ target_link_libraries(nmidebug -lhal) add_dependencies(nmidebug psdk bugcodes) +add_minicd_target(nmidebug reactos) add_livecd_target(nmidebug reactos/system32/drivers) \ No newline at end of file diff --git a/drivers/base/null/CMakeLists.txt b/drivers/base/null/CMakeLists.txt index a2e89e1ff3e..f6346bbea4a 100644 --- a/drivers/base/null/CMakeLists.txt +++ b/drivers/base/null/CMakeLists.txt @@ -11,4 +11,4 @@ target_link_libraries(null -lhal) add_dependencies(null psdk bugcodes) -add_livecd_target(null reactos/system32/drivers) \ No newline at end of file +add_cab_target(null 2) \ No newline at end of file diff --git a/drivers/filesystems/fs_rec/CMakeLists.txt b/drivers/filesystems/fs_rec/CMakeLists.txt index 44493f27090..542eb135f0e 100644 --- a/drivers/filesystems/fs_rec/CMakeLists.txt +++ b/drivers/filesystems/fs_rec/CMakeLists.txt @@ -13,4 +13,4 @@ set_target_properties(fs_rec PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -W add_importlibs(fs_rec ntoskrnl hal) add_dependencies(fs_rec psdk bugcodes) -add_livecd_target(fs_rec reactos/system32/drivers) \ No newline at end of file +add_cab_target(fs_rec 2) \ No newline at end of file diff --git a/drivers/filesystems/msfs/CMakeLists.txt b/drivers/filesystems/msfs/CMakeLists.txt index c3192af6979..706a64f2d1d 100644 --- a/drivers/filesystems/msfs/CMakeLists.txt +++ b/drivers/filesystems/msfs/CMakeLists.txt @@ -14,4 +14,4 @@ set_target_properties(msfs PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl, add_importlibs(msfs ntoskrnl hal) add_pch(msfs ${CMAKE_CURRENT_SOURCE_DIR}/msfs.h ${SOURCE}) add_dependencies(msfs psdk bugcodes) -add_livecd_target(msfs reactos/system32/drivers) \ No newline at end of file +add_cab_target(msfs 2) \ No newline at end of file diff --git a/drivers/filesystems/npfs/CMakeLists.txt b/drivers/filesystems/npfs/CMakeLists.txt index 912639c9325..a95a185bb7d 100644 --- a/drivers/filesystems/npfs/CMakeLists.txt +++ b/drivers/filesystems/npfs/CMakeLists.txt @@ -16,4 +16,4 @@ add_importlibs(npfs ntoskrnl hal) add_pch(npfs ${CMAKE_CURRENT_SOURCE_DIR}/npfs.h ${SOURCE}) add_dependencies(npfs psdk bugcodes) -add_livecd_target(npfs reactos/system32/drivers) \ No newline at end of file +add_cab_target(npfs 2) \ No newline at end of file diff --git a/drivers/input/mouclass/CMakeLists.txt b/drivers/input/mouclass/CMakeLists.txt index b90c93e6ffa..22511e23f89 100644 --- a/drivers/input/mouclass/CMakeLists.txt +++ b/drivers/input/mouclass/CMakeLists.txt @@ -14,4 +14,4 @@ target_link_libraries(mouclass -lhal) add_dependencies(mouclass psdk bugcodes) -add_livecd_target(mouclass reactos/system32/drivers) \ No newline at end of file +add_cab_target(mouclass 2) \ No newline at end of file diff --git a/drivers/network/afd/CMakeLists.txt b/drivers/network/afd/CMakeLists.txt index 2a56dfc0698..768409cc80a 100644 --- a/drivers/network/afd/CMakeLists.txt +++ b/drivers/network/afd/CMakeLists.txt @@ -29,4 +29,4 @@ target_link_libraries(afd add_pch(afd ${CMAKE_CURRENT_SOURCE_DIR}/include/afd.h ${SOURCE}) add_dependencies(afd psdk bugcodes buildno_header) -add_livecd_target(afd reactos/system32/drivers) \ No newline at end of file +add_cab_target(afd 2) \ No newline at end of file diff --git a/drivers/network/dd/ne2000/CMakeLists.txt b/drivers/network/dd/ne2000/CMakeLists.txt index 21349ed6927..8ba68647cdf 100644 --- a/drivers/network/dd/ne2000/CMakeLists.txt +++ b/drivers/network/dd/ne2000/CMakeLists.txt @@ -17,4 +17,4 @@ target_link_libraries(ne2000 add_dependencies(ne2000 psdk bugcodes buildno_header) -add_livecd_target(ne2000 reactos/system32/drivers) \ No newline at end of file +add_cab_target(ne2000 2) \ No newline at end of file diff --git a/drivers/network/dd/pcnet/CMakeLists.txt b/drivers/network/dd/pcnet/CMakeLists.txt index 599d1003829..a73b26cf87a 100644 --- a/drivers/network/dd/pcnet/CMakeLists.txt +++ b/drivers/network/dd/pcnet/CMakeLists.txt @@ -20,4 +20,4 @@ target_link_libraries(pcnet add_dependencies(pcnet psdk bugcodes buildno_header) -add_livecd_target(pcnet reactos/system32/drivers) \ No newline at end of file +add_cab_target(pcnet 2) \ No newline at end of file diff --git a/drivers/network/ndis/CMakeLists.txt b/drivers/network/ndis/CMakeLists.txt index 48419b01d32..972117892b2 100644 --- a/drivers/network/ndis/CMakeLists.txt +++ b/drivers/network/ndis/CMakeLists.txt @@ -44,4 +44,4 @@ target_link_libraries(ndis add_pch(ndis ${CMAKE_CURRENT_SOURCE_DIR}/include/ndissys.h ${SOURCE}) add_dependencies(ndis ndis_def psdk bugcodes buildno_header) -add_livecd_target(ndis reactos/system32/drivers) \ No newline at end of file +add_cab_target(ndis 2) \ No newline at end of file diff --git a/drivers/network/tcpip/CMakeLists.txt b/drivers/network/tcpip/CMakeLists.txt index f2dee678eff..796a6cfbdc0 100644 --- a/drivers/network/tcpip/CMakeLists.txt +++ b/drivers/network/tcpip/CMakeLists.txt @@ -40,4 +40,4 @@ target_link_libraries(tcpip add_pch(tcpip ${CMAKE_CURRENT_SOURCE_DIR}/include/precomp.h ${SOURCE}) add_dependencies(tcpip tcpip_def psdk bugcodes buildno_header) -add_livecd_target(tcpip reactos/system32/drivers) \ No newline at end of file +add_cab_target(tcpip 2) \ No newline at end of file diff --git a/drivers/network/tdi/CMakeLists.txt b/drivers/network/tdi/CMakeLists.txt index 4cbf0d77957..31e298dc070 100644 --- a/drivers/network/tdi/CMakeLists.txt +++ b/drivers/network/tdi/CMakeLists.txt @@ -28,4 +28,4 @@ target_link_libraries(tdi add_dependencies(tdi tdi_def psdk bugcodes buildno_header) -add_livecd_target(tdi reactos/system32/drivers) \ No newline at end of file +add_cab_target(tdi 2) \ No newline at end of file diff --git a/drivers/setup/blue/CMakeLists.txt b/drivers/setup/blue/CMakeLists.txt index b278a92130f..bc00cd3db33 100644 --- a/drivers/setup/blue/CMakeLists.txt +++ b/drivers/setup/blue/CMakeLists.txt @@ -13,4 +13,4 @@ target_link_libraries(blue add_dependencies(blue psdk bugcodes) add_minicd_target(blue reactos blue.sys) -add_livecd_target(blue reactos/system32/drivers) \ No newline at end of file +add_cab_target(blue 2) \ No newline at end of file diff --git a/drivers/usb/nt4compat/usbdriver/CMakeLists.txt b/drivers/usb/nt4compat/usbdriver/CMakeLists.txt index 2dbbb480f74..0f2644f84e7 100644 --- a/drivers/usb/nt4compat/usbdriver/CMakeLists.txt +++ b/drivers/usb/nt4compat/usbdriver/CMakeLists.txt @@ -31,4 +31,4 @@ set_target_properties(usbdriver PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 add_importlibs(usbdriver ntoskrnl hal) add_pch(usbdriver ${CMAKE_CURRENT_SOURCE_DIR}/usbdriver.h ${SOURCE}) add_dependencies(usbdriver psdk bugcodes) -add_livecd_target(usbdriver reactos/system32/drivers) \ No newline at end of file +add_cab_target(usbdriver 2) \ No newline at end of file diff --git a/drivers/video/displays/framebuf/CMakeLists.txt b/drivers/video/displays/framebuf/CMakeLists.txt index c741d6ee9ef..a3bc3643921 100644 --- a/drivers/video/displays/framebuf/CMakeLists.txt +++ b/drivers/video/displays/framebuf/CMakeLists.txt @@ -16,4 +16,4 @@ target_link_libraries(framebuf add_importlibs(framebuf win32k) add_dependencies(framebuf framebuf_def psdk bugcodes) -add_livecd_target(framebuf reactos/system32) \ No newline at end of file +add_cab_target(framebuf 1) \ No newline at end of file diff --git a/drivers/video/displays/vga/CMakeLists.txt b/drivers/video/displays/vga/CMakeLists.txt index 284cb624661..8a17b1f8f97 100644 --- a/drivers/video/displays/vga/CMakeLists.txt +++ b/drivers/video/displays/vga/CMakeLists.txt @@ -20,4 +20,4 @@ target_link_libraries(vgaddi ${CMAKE_CURRENT_BINARY_DIR}/vgaddi.def) add_importlibs(vgaddi win32k) add_dependencies(vgaddi vgaddi_def psdk bugcodes) -add_livecd_target(vgaddi reactos/system32) \ No newline at end of file +add_cab_target(vgaddi 1) \ No newline at end of file diff --git a/drivers/video/font/ftfd/CMakeLists.txt b/drivers/video/font/ftfd/CMakeLists.txt index 5682f110ab1..43fdcdab3ca 100644 --- a/drivers/video/font/ftfd/CMakeLists.txt +++ b/drivers/video/font/ftfd/CMakeLists.txt @@ -19,4 +19,4 @@ target_link_libraries(ftfd libcntpr) add_dependencies(ftfd psdk) -add_livecd_target(ftfd reactos/system32) \ No newline at end of file +add_cab_target(ftfd 1) \ No newline at end of file diff --git a/drivers/video/miniport/vbe/CMakeLists.txt b/drivers/video/miniport/vbe/CMakeLists.txt index 331ba90da4a..a4606cfe107 100644 --- a/drivers/video/miniport/vbe/CMakeLists.txt +++ b/drivers/video/miniport/vbe/CMakeLists.txt @@ -8,4 +8,4 @@ set_target_properties(vbemp PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl add_importlibs(vbemp videoprt) add_dependencies(vbemp psdk bugcodes) -add_livecd_target(vbemp reactos/system32/drivers) \ No newline at end of file +add_cab_target(vbemp 2) \ No newline at end of file diff --git a/drivers/video/miniport/vga/CMakeLists.txt b/drivers/video/miniport/vga/CMakeLists.txt index 2df163eefde..10c1f75efed 100644 --- a/drivers/video/miniport/vga/CMakeLists.txt +++ b/drivers/video/miniport/vga/CMakeLists.txt @@ -11,4 +11,4 @@ set_target_properties(vgamp PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl add_importlibs(vgamp videoprt) add_pch(vgamp ${CMAKE_CURRENT_SOURCE_DIR}/vgamp.h ${SOURCE}) add_dependencies(vgamp psdk bugcodes) -add_livecd_target(vgamp reactos/system32/drivers) \ No newline at end of file +add_cab_target(vgamp 2) \ No newline at end of file diff --git a/drivers/video/miniport/vga_new/CMakeLists.txt b/drivers/video/miniport/vga_new/CMakeLists.txt index a955cf4af24..37249a5774c 100644 --- a/drivers/video/miniport/vga_new/CMakeLists.txt +++ b/drivers/video/miniport/vga_new/CMakeLists.txt @@ -16,4 +16,4 @@ target_link_libraries(vga libcntpr) add_importlibs(vga videoprt) add_pch(vga ${CMAKE_CURRENT_SOURCE_DIR}/vga.h ${SOURCE}) add_dependencies(vga psdk bugcodes) -add_livecd_target(vga reactos/system32/drivers) \ No newline at end of file +add_cab_target(vga 2) \ No newline at end of file diff --git a/drivers/video/videoprt/CMakeLists.txt b/drivers/video/videoprt/CMakeLists.txt index 9d910084721..833c4fd3ba7 100644 --- a/drivers/video/videoprt/CMakeLists.txt +++ b/drivers/video/videoprt/CMakeLists.txt @@ -35,4 +35,4 @@ target_link_libraries(videoprt add_pch(videoprt ${CMAKE_CURRENT_SOURCE_DIR}/videoprt.h ${SOURCE}) add_dependencies(videoprt videoprt_def psdk bugcodes buildno_header) -add_livecd_target(videoprt reactos/system32/drivers) \ No newline at end of file +add_cab_target(videoprt 2) \ No newline at end of file diff --git a/hal/CMakeLists.txt b/hal/CMakeLists.txt index 2800513b16e..2c19a8713b9 100644 --- a/hal/CMakeLists.txt +++ b/hal/CMakeLists.txt @@ -99,7 +99,7 @@ add_library(mini_hal ${MINI_HAL_SOURCE}) set_property(TARGET mini_hal PROPERTY COMPILE_DEFINITIONS "_BLDR_;_MINIHAL_") add_dependencies(mini_hal psdk bugcodes) add_minicd_target(hal reactos hal.dll) -add_livecd_target(hal reactos/system32 hal.dll) +add_livecd_target(hal reactos/system32) else() #TBD endif(ARCH MATCHES i386) \ No newline at end of file diff --git a/media/CMakeLists.txt b/media/CMakeLists.txt index a4413743851..6894ede1c45 100644 --- a/media/CMakeLists.txt +++ b/media/CMakeLists.txt @@ -1,4 +1,12 @@ add_subdirectory(fonts) add_subdirectory(inf) add_subdirectory(nls) -add_subdirectory(vgafonts) \ No newline at end of file +add_subdirectory(vgafonts) + +add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/drivers/etc/hosts reactos hosts) +add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/drivers/etc/KDBinit reactos KDBinit) +add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/drivers/etc/services reactos services) + +add_livecd(${CMAKE_CURRENT_SOURCE_DIR}/drivers/etc/hosts reactos/system32/drivers/etc hosts) +add_livecd(${CMAKE_CURRENT_SOURCE_DIR}/drivers/etc/KDBinit reactos/system32/drivers/etc KDBinit) +add_livecd(${CMAKE_CURRENT_SOURCE_DIR}/drivers/etc/services reactos/system32/drivers/etc services) \ No newline at end of file diff --git a/media/fonts/CMakeLists.txt b/media/fonts/CMakeLists.txt index 3cb7ef08099..269d580c732 100644 --- a/media/fonts/CMakeLists.txt +++ b/media/fonts/CMakeLists.txt @@ -1,4 +1,4 @@ file(GLOB NLS_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.ttf") foreach(item ${NLS_FILES}) - add_livecd("${CMAKE_CURRENT_SOURCE_DIR}/${item}" reactos/fonts ${item}) + add_cab("${CMAKE_CURRENT_SOURCE_DIR}/${item}" 3) endforeach(item) \ No newline at end of file diff --git a/media/inf/CMakeLists.txt b/media/inf/CMakeLists.txt index ffef1c15d3a..54d255b49b1 100644 --- a/media/inf/CMakeLists.txt +++ b/media/inf/CMakeLists.txt @@ -1,6 +1,6 @@ file(GLOB NLS_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.inf") foreach(item ${NLS_FILES}) - add_livecd("${CMAKE_CURRENT_SOURCE_DIR}/${item}" reactos/inf ${item}) + add_cab("${CMAKE_CURRENT_SOURCE_DIR}/${item}" 6) endforeach(item) add_livecd(${CMAKE_CURRENT_SOURCE_DIR}/syssetup.inf.trunk reactos/inf syssetup.inf) \ No newline at end of file diff --git a/media/nls/CMakeLists.txt b/media/nls/CMakeLists.txt index 62166b9ef31..a9a7462177f 100644 --- a/media/nls/CMakeLists.txt +++ b/media/nls/CMakeLists.txt @@ -1,8 +1,70 @@ add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/l_intl.nls reactos l_intl.nls) add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/c_437.nls reactos c_437.nls) add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/c_1252.nls reactos c_1252.nls) +add_livecd(${CMAKE_CURRENT_SOURCE_DIR}/l_intl.nls reactos/system32) +add_livecd(${CMAKE_CURRENT_SOURCE_DIR}/c_437.nls reactos/system32 c_437.nls) +add_livecd(${CMAKE_CURRENT_SOURCE_DIR}/c_1252.nls reactos/system32 c_1252.nls) -file(GLOB NLS_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.nls") +list(APPEND NLS_FILES + c_037.nls + c_424.nls + c_500.nls + c_737.nls + c_775.nls + c_850.nls + c_852.nls + c_855.nls + c_856.nls + c_857.nls + c_860.nls + c_861.nls + c_862.nls + c_863.nls + c_864.nls + c_865.nls + c_866.nls + c_869.nls + c_874.nls + c_875.nls + c_878.nls + c_932.nls + c_936.nls + c_949.nls + c_950.nls + c_1006.nls + c_1026.nls + c_1250.nls + c_1251.nls + c_1253.nls + c_1254.nls + c_1255.nls + c_1256.nls + c_1257.nls + c_1258.nls + c_10000.nls + c_10006.nls + c_10007.nls + c_10029.nls + c_10079.nls + c_10081.nls + c_20866.nls + c_21866.nls + c_28591.nls + c_28592.nls + c_28594.nls + c_28595.nls + c_28596.nls + c_28597.nls + c_28598.nls + c_28599.nls + c_28600.nls + c_28603.nls + c_28604.nls + c_28605.nls + c_28606.nls +) + + foreach(item ${NLS_FILES}) - add_livecd("${CMAKE_CURRENT_SOURCE_DIR}/${item}" reactos/system32 ${item}) + add_cab("${CMAKE_CURRENT_SOURCE_DIR}/${item}" 1 ${item}) endforeach(item) \ No newline at end of file diff --git a/media/vgafonts/CMakeLists.txt b/media/vgafonts/CMakeLists.txt index 2d06938b0d8..47535cec678 100644 --- a/media/vgafonts/CMakeLists.txt +++ b/media/vgafonts/CMakeLists.txt @@ -14,4 +14,6 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/vgafonts.cab COMMAND native-cabman -M raw -S ${CMAKE_CURRENT_BINARY_DIR}/vgafonts.cab ${SOURCE} DEPENDS ${SOURCE}) -add_custom_target(vgafonts DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/vgafonts.cab) \ No newline at end of file +add_custom_target(vgafonts DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/vgafonts.cab) + +add_minicd(${CMAKE_CURRENT_BINARY_DIR}/vgafonts.cab reactos vgafonts.cab) \ No newline at end of file diff --git a/ros_cd.cmake b/ros_cd.cmake new file mode 100644 index 00000000000..bb464f6b112 --- /dev/null +++ b/ros_cd.cmake @@ -0,0 +1,155 @@ +#reactos.cab +add_custom_command( + OUTPUT ${REACTOS_BINARY_DIR}/bootcd/reactos/reactos.inf + COMMAND native-cabman -C ${REACTOS_BINARY_DIR}/boot/reactos.dff -L ${REACTOS_BINARY_DIR}/boot/bootcd/reactos -I +) +add_custom_target( + reactos_cab + COMMAND native-cabman -C ${REACTOS_BINARY_DIR}/boot/reactos.dff -RC ${REACTOS_BINARY_DIR}/boot/bootcd/reactos/reactos.inf -L ${REACTOS_BINARY_DIR}/boot/bootcd/reactos -N + DEPENDS ${REACTOS_BINARY_DIR}/bootcd/reactos/reactos.inf +) + +file(WRITE ${REACTOS_BINARY_DIR}/boot/reactos.dff +"; Main ReactOS package + +.Set DiskLabelTemplate=\"ReactOS\" ; Label of disk +.Set CabinetNameTemplate=\"reactos.cab\" ; reactos.cab +.Set InfFileName=\"reactos.inf\" ; reactos.inf + + +;.Set Cabinet=on +;.Set Compress=on + +.InfBegin +[Version] +Signature = \"$ReactOS$\" + +[Directories] +1 = system32 +2 = system32\\drivers +3 = Fonts +4 = +5 = system32\\drivers\\etc +6 = inf +7 = bin +8 = media + +.InfEnd + +; Contents of disk +.InfBegin +[SourceFiles] +.InfEnd +" +) +file(STRINGS ${REACTOS_BINARY_DIR}/boot/ros_cab_target.txt CAB_TARGET_ENTRIES) +foreach(ENTRY ${CAB_TARGET_ENTRIES}) + string(REGEX REPLACE "^(.*)\t.*" "\\1" _targetname ${ENTRY}) + string(REGEX REPLACE "^.*\t(.)" "\\1" _dir_num ${ENTRY}) + get_target_property(_FILENAME ${_targetname} LOCATION) + file(APPEND ${REACTOS_BINARY_DIR}/boot/reactos.dff "${_FILENAME} ${_dir_num}\n") + add_dependencies(reactos_cab ${_targetname}) +endforeach() + +file(STRINGS ${REACTOS_BINARY_DIR}/boot/ros_cab.txt CAB_TARGET_ENTRIES) +foreach(ENTRY ${CAB_TARGET_ENTRIES}) + string(REGEX REPLACE "^(.*)\t.*" "\\1" _FILENAME ${ENTRY}) + string(REGEX REPLACE "^.*\t(.)" "\\1" _dir_num ${ENTRY}) + file(APPEND ${REACTOS_BINARY_DIR}/boot/reactos.dff "${_FILENAME} ${_dir_num}\n") +endforeach() + +#bootcd target +set(BOOTCD_DIR "${REACTOS_BINARY_DIR}/boot/bootcd") + +file(MAKE_DIRECTORY "${BOOTCD_DIR}") +file(MAKE_DIRECTORY "${BOOTCD_DIR}/loader") +file(MAKE_DIRECTORY "${BOOTCD_DIR}/reactos") +file(MAKE_DIRECTORY "${BOOTCD_DIR}/reactos/system32") + +file(STRINGS ${REACTOS_BINARY_DIR}/boot/ros_minicd_target.txt MINICD_TARGET_ENTRIES) +foreach(ENTRY ${MINICD_TARGET_ENTRIES}) + string(REGEX REPLACE "^(.*)\t.*\t.*" "\\1" _targetname ${ENTRY}) + string(REGEX REPLACE "^.*\t(.*)\t.*" "\\1" _DIR ${ENTRY}) + string(REGEX REPLACE "^.*\t.*\t(.*)" "\\1"_NAMEONCD ${ENTRY}) + get_target_property(_FILENAME ${_targetname} LOCATION) + set(filename ${BOOTCD_DIR}/${_DIR}/${_NAMEONCD}) + list( APPEND BOOTCD_FILES ${filename}) + add_custom_command( + OUTPUT ${filename} + COMMAND ${CMAKE_COMMAND} -E copy ${_FILENAME} ${BOOTCD_DIR}/${_DIR}/${_NAMEONCD} + DEPENDS ${_targetname} + ) +endforeach() + +file(STRINGS ${REACTOS_BINARY_DIR}/boot/ros_minicd.txt MINICD_ENTRIES) +foreach(ENTRY ${MINICD_ENTRIES}) + string(REGEX REPLACE "^(.*)\t.*\t.*" "\\1" _FILENAME ${ENTRY}) + string(REGEX REPLACE "^.*\t(.*)\t.*" "\\1" _DIR ${ENTRY}) + string(REGEX REPLACE "^.*\t.*\t(.*)" "\\1"_NAMEONCD ${ENTRY}) + set(filename ${BOOTCD_DIR}/${_DIR}/${_NAMEONCD}) + list( APPEND BOOTCD_FILES ${filename}) + add_custom_command( + OUTPUT ${filename} + COMMAND ${CMAKE_COMMAND} -E copy ${_FILENAME} ${BOOTCD_DIR}/${_DIR}/${_NAMEONCD} + DEPENDS ${_FILENAME} + ) +endforeach() + +add_custom_target(bootcd + COMMAND native-cdmake -v -j -m -b ${CMAKE_CURRENT_BINARY_DIR}/boot/freeldr/bootsect/isoboot.bin ${BOOTCD_DIR} REACTOS ${REACTOS_BINARY_DIR}/minicd.iso + DEPENDS ${BOOTCD_FILES}) + +add_dependencies(bootcd reactos_cab dosmbr ext2 fat32 fat isoboot isobtrt vgafonts) + +set_directory_properties(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${REACTOS_BINARY_DIR}/minicd.iso) + +#livecd target +file(MAKE_DIRECTORY "${LIVECD_DIR}") +file(MAKE_DIRECTORY "${LIVECD_DIR}/loader") +file(MAKE_DIRECTORY "${LIVECD_DIR}/Profiles") +file(MAKE_DIRECTORY "${LIVECD_DIR}/Profiles/All Users") +file(MAKE_DIRECTORY "${LIVECD_DIR}/Profiles/All Users/Desktop") +file(MAKE_DIRECTORY "${LIVECD_DIR}/Profiles/Default User") +file(MAKE_DIRECTORY "${LIVECD_DIR}/Profiles/Default User/Desktop") +file(MAKE_DIRECTORY "${LIVECD_DIR}/Profiles/Default User/My Documents") +file(MAKE_DIRECTORY "${LIVECD_DIR}/reactos") +file(MAKE_DIRECTORY "${LIVECD_DIR}/reactos/inf") +file(MAKE_DIRECTORY "${LIVECD_DIR}/reactos/fonts") +file(MAKE_DIRECTORY "${LIVECD_DIR}/reactos/system32") +file(MAKE_DIRECTORY "${LIVECD_DIR}/reactos/system32/config") + +file(STRINGS ${REACTOS_BINARY_DIR}/boot/ros_livecd_target.txt LIVECD_TARGET_ENTRIES) +foreach(ENTRY ${LIVECD_TARGET_ENTRIES}) + string(REGEX REPLACE "^(.*)\t.*\t.*" "\\1" _targetname ${ENTRY}) + string(REGEX REPLACE "^.*\t(.*)\t.*" "\\1" _DIR ${ENTRY}) + string(REGEX REPLACE "^.*\t.*\t(.*)" "\\1"_NAMEONCD ${ENTRY}) + get_target_property(_FILENAME ${_targetname} LOCATION) + set(filename ${LIVECD_DIR}/${_DIR}/${_NAMEONCD}) + list( APPEND LIVECD_FILES ${filename}) + add_custom_command( + OUTPUT ${filename} + COMMAND ${CMAKE_COMMAND} -E copy ${_FILENAME} ${LIVECD_DIR}/${_DIR}/${_NAMEONCD} + DEPENDS ${_targetname} + ) +endforeach() +file(STRINGS ${REACTOS_BINARY_DIR}/boot/ros_livecd.txt LIVECD_ENTRIES) + +foreach(ENTRY ${LIVECD_ENTRIES}) + string(REGEX REPLACE "^(.*)\t.*\t.*" "\\1" _FILENAME ${ENTRY}) + string(REGEX REPLACE "^.*\t(.*)\t.*" "\\1" _DIR ${ENTRY}) + string(REGEX REPLACE "^.*\t.*\t(.*)" "\\1"_NAMEONCD ${ENTRY}) + set(filename ${LIVECD_DIR}/${_DIR}/${_NAMEONCD}) + list( APPEND LIVECD_FILES ${filename}) + add_custom_command( + OUTPUT ${filename} + COMMAND ${CMAKE_COMMAND} -E copy ${_FILENAME} ${LIVECD_DIR}/${_DIR}/${_NAMEONCD} + DEPENDS ${_FILENAME} + ) +endforeach() + +add_custom_target(livecd + COMMAND native-cdmake -v -j -m -b ${CMAKE_CURRENT_BINARY_DIR}/boot/freeldr/bootsect/isoboot.bin ${LIVECD_DIR} REACTOS ${REACTOS_BINARY_DIR}/livecd.iso + DEPENDS ${LIVECD_FILES}) +add_dependencies(livecd isoboot livecd_hives) + +set_directory_properties(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${REACTOS_BINARY_DIR}/livecd.iso) \ No newline at end of file diff --git a/subsystems/win32/csrss/CMakeLists.txt b/subsystems/win32/csrss/CMakeLists.txt index c68dabb85e9..001656b9b3e 100644 --- a/subsystems/win32/csrss/CMakeLists.txt +++ b/subsystems/win32/csrss/CMakeLists.txt @@ -15,4 +15,4 @@ add_dependencies(csrss psdk bugcodes) add_subdirectory(csrsrv) add_subdirectory(win32csr) -add_livecd_target(csrss reactos/system32) \ No newline at end of file +add_cab_target(csrss 1) \ No newline at end of file diff --git a/subsystems/win32/csrss/csrsrv/CMakeLists.txt b/subsystems/win32/csrss/csrsrv/CMakeLists.txt index 846410c33a1..8768840aff2 100644 --- a/subsystems/win32/csrss/csrsrv/CMakeLists.txt +++ b/subsystems/win32/csrss/csrsrv/CMakeLists.txt @@ -25,4 +25,4 @@ add_importlibs(csrsrv ntdll smdll) add_pch(csrsrv ${CMAKE_CURRENT_SOURCE_DIR}/srv.h ${SOURCE}) add_dependencies(csrsrv csrsrv_def psdk bugcodes) -add_livecd_target(csrsrv reactos/system32) \ No newline at end of file +add_cab_target(csrsrv 1) \ No newline at end of file diff --git a/subsystems/win32/csrss/win32csr/CMakeLists.txt b/subsystems/win32/csrss/win32csr/CMakeLists.txt index ffb76765ad5..c75309aadf1 100644 --- a/subsystems/win32/csrss/win32csr/CMakeLists.txt +++ b/subsystems/win32/csrss/win32csr/CMakeLists.txt @@ -40,4 +40,4 @@ add_importlibs(win32csr user32 gdi32 advapi32 psapi kernel32 ntdll) add_pch(win32csr ${CMAKE_CURRENT_SOURCE_DIR}/w32csr.h ${SOURCE}) add_dependencies(win32csr win32csr_def bugcodes) -add_livecd_target(win32csr reactos/system32) +add_cab_target(win32csr 1) diff --git a/subsystems/win32/win32k/CMakeLists.txt b/subsystems/win32/win32k/CMakeLists.txt index 4ae7499f5a3..403b9d73e4a 100644 --- a/subsystems/win32/win32k/CMakeLists.txt +++ b/subsystems/win32/win32k/CMakeLists.txt @@ -188,4 +188,4 @@ target_link_libraries(win32k add_importlibs(win32k ntoskrnl hal ftfd) add_pch(win32k ${CMAKE_CURRENT_SOURCE_DIR}/pch.h ${SOURCE}) add_dependencies(win32k gendib_generated subsystem_napi) -add_livecd_target(win32k reactos/system32) \ No newline at end of file +add_cab_target(win32k 1) \ No newline at end of file