mirror of
https://github.com/reactos/reactos.git
synced 2025-01-10 16:18:16 +00:00
[CMAKE]
Bye, bye, winebuild. Welcome spec2def. svn path=/branches/cmake-bringup/; revision=49675
This commit is contained in:
parent
e3d6ac2051
commit
8ee00e2746
3 changed files with 5 additions and 5 deletions
|
@ -41,9 +41,9 @@ add_subdirectory(tools)
|
||||||
add_subdirectory(lib)
|
add_subdirectory(lib)
|
||||||
|
|
||||||
if(NOT MSVC)
|
if(NOT MSVC)
|
||||||
export(TARGETS widl winebuild nci buildno gendib cabman cdmake mkhive spec2def geninc FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- )
|
export(TARGETS widl nci buildno gendib cabman cdmake mkhive spec2def geninc FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- )
|
||||||
else()
|
else()
|
||||||
export(TARGETS winebuild nci buildno gendib cabman cdmake mkhive spec2def geninc FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- )
|
export(TARGETS nci buildno gendib cabman cdmake mkhive spec2def geninc FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- )
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
else()
|
else()
|
||||||
|
|
|
@ -61,7 +61,7 @@ MACRO(CreateBootSectorTarget _target_name _asm_file _object_file)
|
||||||
add_custom_command(
|
add_custom_command(
|
||||||
OUTPUT ${_object_file}
|
OUTPUT ${_object_file}
|
||||||
COMMAND nasm -o ${_object_file} ${result_incs} ${result_defs} -f bin ${_asm_file}
|
COMMAND nasm -o ${_object_file} ${result_incs} ${result_defs} -f bin ${_asm_file}
|
||||||
DEPENDS native-winebuild)
|
DEPENDS ${_asm_file})
|
||||||
set_source_files_properties(${_object_file} PROPERTIES GENERATED TRUE)
|
set_source_files_properties(${_object_file} PROPERTIES GENERATED TRUE)
|
||||||
add_custom_target(${_target_name} ALL DEPENDS ${_object_file})
|
add_custom_target(${_target_name} ALL DEPENDS ${_object_file})
|
||||||
add_minicd(${_object_file} loader ${OBJECT_NAME})
|
add_minicd(${_object_file} loader ${OBJECT_NAME})
|
||||||
|
|
|
@ -158,10 +158,10 @@ macro(spec2def _dllname _spec_file)
|
||||||
get_filename_component(_file ${_spec_file} NAME_WE)
|
get_filename_component(_file ${_spec_file} NAME_WE)
|
||||||
add_custom_command(
|
add_custom_command(
|
||||||
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def
|
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def
|
||||||
COMMAND native-winebuild -o ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def --def -E ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} --filename ${_dllname}
|
COMMAND native-spec2def --dll ${_dllname} ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def
|
||||||
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file})
|
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file})
|
||||||
set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_file}.def
|
set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_file}.def
|
||||||
PROPERTIES GENERATED TRUE EXTERNAL_OBJECT TRUE)
|
PROPERTIES GENERATED TRUE)
|
||||||
endmacro()
|
endmacro()
|
||||||
|
|
||||||
# Optional 3rd parameter: dllname
|
# Optional 3rd parameter: dllname
|
||||||
|
|
Loading…
Reference in a new issue