From fda2e2e4f8c3d09b447dea316f4e44fc92c586e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Gardou?= Date: Sat, 30 Oct 2010 12:51:21 +0000 Subject: [PATCH] [CMAKE] - add explorer-cfg-template.xml to livecd and bootcd - add idndl.dll to livecd svn path=/branches/cmake-bringup/; revision=49351 --- base/shell/explorer/CMakeLists.txt | 3 ++- boot/freeldr/freeldr/debug.c | 4 ++-- dll/nls/idndl/CMakeLists.txt | 2 ++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/base/shell/explorer/CMakeLists.txt b/base/shell/explorer/CMakeLists.txt index c482f6a2143..45b91bf6643 100644 --- a/base/shell/explorer/CMakeLists.txt +++ b/base/shell/explorer/CMakeLists.txt @@ -82,4 +82,5 @@ target_link_libraries(explorer set_image_base(explorer 0x00400000) add_dependencies(explorer psdk buildno_header) -add_cab_target(explorer 4) \ No newline at end of file +add_cab_target(explorer 4) +add_cab(${CMAKE_CURRENT_SOURCE_DIR}/explorer-cfg-template.xml 4) \ No newline at end of file diff --git a/boot/freeldr/freeldr/debug.c b/boot/freeldr/freeldr/debug.c index 4ab90966192..04f953821e9 100644 --- a/boot/freeldr/freeldr/debug.c +++ b/boot/freeldr/freeldr/debug.c @@ -25,9 +25,9 @@ //#define DEBUG_ALL //#define DEBUG_INIFILE -//#define DEBUG_REACTOS +#define DEBUG_REACTOS //#define DEBUG_CUSTOM -#define DEBUG_NONE +//#define DEBUG_NONE #if defined (DEBUG_ALL) ULONG DebugPrintMask = DPRINT_WARNING | DPRINT_MEMORY | DPRINT_FILESYSTEM | diff --git a/dll/nls/idndl/CMakeLists.txt b/dll/nls/idndl/CMakeLists.txt index 3d5348e756d..0bfd91bd465 100644 --- a/dll/nls/idndl/CMakeLists.txt +++ b/dll/nls/idndl/CMakeLists.txt @@ -17,3 +17,5 @@ endif(NOT MSVC) add_importlibs(idndl kernel32) add_dependencies(idndl idndl_def psdk buildno_header) + +add_livecd_target(idndl reactos)