[CMAKE]

Add missing files to bootcd.

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

diff --git a/base/setup/reactos/CMakeLists.txt b/base/setup/reactos/CMakeLists.txt
index 89168fb..572fab2 100644 (file)
--- a/base/setup/reactos/CMakeLists.txt
+++ b/base/setup/reactos/CMakeLists.txt
@@ -14,3 +14,5 @@ add_importlibs(reactos
     msvcrt
     kernel32
     ntdll)
     msvcrt
     kernel32
     ntdll)

+
+add_minicd_target(reactos reactos)
\ No newline at end of file

diff --git a/base/setup/welcome/CMakeLists.txt b/base/setup/welcome/CMakeLists.txt
index 970b28e..0d68a59 100644 (file)
--- a/base/setup/welcome/CMakeLists.txt
+++ b/base/setup/welcome/CMakeLists.txt
@@ -5,3 +5,5 @@ add_executable(welcome welcome.c welcome.rc)
 
 set_module_type(welcome win32gui)
 add_importlibs(welcome gdi32 user32 msvcrt kernel32 ntdll)
 
 set_module_type(welcome win32gui)
 add_importlibs(welcome gdi32 user32 msvcrt kernel32 ntdll)

+
+add_minicd_target(welcome reactos)
\ No newline at end of file

diff --git a/boot/CMakeLists.txt b/boot/CMakeLists.txt
index 0406293..7f2770c 100644 (file)
--- a/boot/CMakeLists.txt
+++ b/boot/CMakeLists.txt
@@ -215,7 +215,9 @@ add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/bootdata/hivecls_${ARCH}.inf reactos hive
 add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/bootdata/hivedef_${ARCH}.inf reactos hivedef.inf)
 add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/bootdata/hivesft_${ARCH}.inf reactos hivesft.inf)
 add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/bootdata/hivesys_${ARCH}.inf reactos hivesys.inf)
 add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/bootdata/hivedef_${ARCH}.inf reactos hivedef.inf)
 add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/bootdata/hivesft_${ARCH}.inf reactos hivesft.inf)
 add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/bootdata/hivesys_${ARCH}.inf reactos hivesys.inf)

-
+add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/bootdata/autorun.inf "" autorun.inf)
+add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/bootdata/icon.ico "" icon.ico)
+add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/bootdata/readme.txt "" readme.txt)

 # Livecd files
 list(APPEND LIVECD_HIVES
     ${CMAKE_CURRENT_SOURCE_DIR}/bootdata/livecd.inf
 # Livecd files
 list(APPEND LIVECD_HIVES
     ${CMAKE_CURRENT_SOURCE_DIR}/bootdata/livecd.inf

diff --git a/drivers/ksfilter/ks/CMakeLists.txt b/drivers/ksfilter/ks/CMakeLists.txt
index d9cbe0c..b5d0d34 100644 (file)
--- a/drivers/ksfilter/ks/CMakeLists.txt
+++ b/drivers/ksfilter/ks/CMakeLists.txt
@@ -38,3 +38,5 @@ target_link_libraries(ks
 
 add_importlibs(ks ntoskrnl hal msvcrt)
 add_dependencies(ks psdk bugcodes)
 
 add_importlibs(ks ntoskrnl hal msvcrt)
 add_dependencies(ks psdk bugcodes)

+
+add_cab_target(ks 2)
\ No newline at end of file

diff --git a/importlibs/libd3d9.a b/importlibs/libd3d9.a
new file mode 100644 (file)
index 0000000..7eb22b8
Binary files /dev/null and b/importlibs/libd3d9.a differ