[CMAKE]

[reactos.git] / boot / CMakeLists.txt

diff --git a/boot/CMakeLists.txt b/boot/CMakeLists.txt
index c6d9813..0406293 100644 (file)
--- a/boot/CMakeLists.txt
+++ b/boot/CMakeLists.txt
@@ -205,24 +205,28 @@ target_link_libraries(setupldr
     cmlib
     rtl
     libcntpr)
+    
+# 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_i386.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}
+    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)
-
-# Livecd files
 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