\r
ENDMACRO(add_pch _target_name _header_filename _src_list)\r
\r
-MACRO(spec2def _target_name _spec_file _def_file)\r
-\r
+MACRO(spec2def _dllname _spec_file)
+ get_filename_component(_file ${_spec_file} NAME_WE)\r
add_custom_command(\r
- OUTPUT ${_def_file}\r
- COMMAND native-winebuild -o ${_def_file} --def -E ${_spec_file} --filename ${_target_name}.dll\r
- DEPENDS native-winebuild)\r
- set_source_files_properties(${_def_file} PROPERTIES GENERATED TRUE)\r
- add_custom_target(${_target_name}_def ALL DEPENDS ${_def_file})\r
-\r
-ENDMACRO(spec2def _target_name _spec_file _def_file)\r
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def\r
+ COMMAND native-winebuild -o ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def --def -E ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} --filename ${_dllname}\r
+ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file})\r
+ENDMACRO(spec2def _dllname _spec_file)\r
\r
if (NOT MSVC)\r
MACRO(CreateBootSectorTarget _target_name _asm_file _object_file)\r
ENDMACRO()\r
\r
MACRO(add_minicd_target _targetname _dir) # optional parameter: _nameoncd\r
- get_target_property(FILENAME ${_targetname} LOCATION)\r
-\r
- if("${ARGN}" STREQUAL "")\r
- get_filename_component(_nameoncd ${FILENAME} NAME)\r
- else()\r
- set(_nameoncd ${ARGN})\r
- endif()\r
-\r
- add_custom_target(${_targetname}_minicd \r
- COMMAND ${CMAKE_COMMAND} -E copy ${FILENAME} ${BOOTCD_DIR}/${_dir}/${_nameoncd}\r
- DEPENDS ${_targetname})\r
- set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${BOOTCD_DIR}/${_dir}/${_nameoncd})\r
-\r
- add_dependencies(minicd ${_targetname}_minicd)\r
+ 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")\r
ENDMACRO(add_minicd_target)\r
\r
MACRO(add_minicd FILENAME _dir _nameoncd)\r
- add_custom_target(${_nameoncd}_minicd\r
- COMMAND ${CMAKE_COMMAND} -E copy ${FILENAME} ${BOOTCD_DIR}/${_dir}/${_nameoncd}\r
- DEPENDS ${FILENAME})\r
- set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${BOOTCD_DIR}/${_dir}/${_nameoncd})\r
- \r
- add_dependencies(minicd ${_nameoncd}_minicd)\r
+ file(APPEND ${REACTOS_BINARY_DIR}/boot/ros_minicd.txt "${FILENAME}\t${_dir}\t${_nameoncd}\n")\r
ENDMACRO(add_minicd)\r
macro(set_cpp)
include_directories(BEFORE ${REACTOS_SOURCE_DIR}/lib/3rdparty/stlport/stlport)
set(IS_CPP 1)
endmacro()
-\r
+
MACRO(add_livecd_target _targetname _dir )# optional parameter : _nameoncd\r
- \r
- get_target_property(FILENAME ${_targetname} LOCATION)\r
-\r
- if("${ARGN}" STREQUAL "")\r
+ if("${ARGN}" STREQUAL "")
+ get_target_property(FILENAME ${_targetname} LOCATION)\r
get_filename_component(_nameoncd ${FILENAME} NAME)\r
else()\r
set(_nameoncd ${ARGN})\r
- endif()\r
-\r
- add_custom_target(${_targetname}_livecd \r
- COMMAND ${CMAKE_COMMAND} -E copy ${FILENAME} ${LIVECD_DIR}/${_dir}/${_nameoncd}\r
- DEPENDS ${_targetname})\r
- set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${LIVECD_DIR}/${_dir}/${_nameoncd})\r
-\r
- add_dependencies(livecd ${_targetname}_livecd)\r
-ENDMACRO(add_livecd_target)\r
-\r
-MACRO(add_livecd FILENAME _dir _nameoncd)\r
- add_custom_target(${_nameoncd}_livecd\r
- COMMAND ${CMAKE_COMMAND} -E copy ${FILENAME} ${LIVECD_DIR}/${_dir}/${_nameoncd}\r
- DEPENDS ${FILENAME})\r
- set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${LIVECD_DIR}/${_dir}/${_nameoncd})\r
-\r
- add_dependencies(livecd ${_nameoncd}_livecd)\r
-ENDMACRO(add_livecd)\r
+ endif()
+
+ file(APPEND ${REACTOS_BINARY_DIR}/boot/ros_livecd_target.txt "${_targetname}\t${_dir}\t${_nameoncd}\n")\r
+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) \r
\r
macro(custom_incdefs)\r
if(NOT DEFINED result_incs) #rpc_defines\r