-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_livecd_target)\r
+\r
+MACRO(add_livecd FILENAME _dir)# optional parameter : _nameoncd\r
+ if("${ARGN}" STREQUAL "")\r
+ get_filename_component(_nameoncd ${FILENAME} NAME)\r
+ else()\r
+ set(_nameoncd ${ARGN})\r
+ endif()\r
+ file(APPEND ${REACTOS_BINARY_DIR}/boot/ros_livecd.txt "${FILENAME}\t${_dir}\t${_nameoncd}\n")\r
+ENDMACRO(add_livecd)\r
+\r
+macro(cab_to_dir _dir_num _var_name)\r
+# 1 = system32\r
+# 2 = system32\drivers\r
+# 3 = Fonts\r
+# 4 =\r
+# 5 = system32\drivers\etc\r
+# 6 = inf\r
+# 7 = bin\r
+# 8 = media\r
+ if(${_dir_num} STREQUAL "1")\r
+ set(${_var_name} "reactos/system32")\r
+ elseif(${_dir_num} STREQUAL "2")\r
+ set(${_var_name} "reactos/system32/drivers")\r
+ elseif(${_dir_num} STREQUAL "3")\r
+ set(${_var_name} "reactos/fonts")\r
+ elseif(${_dir_num} STREQUAL "4")\r
+ set(${_var_name} "reactos")\r
+ elseif(${_dir_num} STREQUAL "5")\r
+ set(${_var_name} "reactos/system32/drivers/etc")\r
+ elseif(${_dir_num} STREQUAL "6")\r
+ set(${_var_name} "reactos/inf")\r
+ elseif(${_dir_num} STREQUAL "7")\r
+ set(${_var_name} "reactos/bin")\r
+ elseif(${_dir_num} STREQUAL "8")\r
+ set(${_var_name} "reactos/system32/drivers")\r
+ else()\r
+ message(FATAL_ERROR "Wrong directory ${_dir_num}")\r
+ endif()\r
+endmacro()\r
+\r
+MACRO(add_cab_target _targetname _num )\r
+ file(APPEND ${REACTOS_BINARY_DIR}/boot/ros_cab_target.txt "${_targetname}\t${_num}\n")\r
+ cab_to_dir(${_num} _dir)\r
+ add_livecd_target(${_targetname} ${_dir})\r
+ENDMACRO(add_cab_target)\r
+\r
+MACRO(add_cab FILENAME _num)\r
+ file(APPEND ${REACTOS_BINARY_DIR}/boot/ros_cab.txt "${FILENAME}\t${_num}\n")\r
+ cab_to_dir(${_num} _dir)\r
+ add_livecd(${FILENAME} ${_dir})\r