[CMAKE]
authorTimo Kreuzer <timo.kreuzer@reactos.org>
Sat, 20 Nov 2010 21:43:57 +0000 (21:43 +0000)
committerTimo Kreuzer <timo.kreuzer@reactos.org>
Sat, 20 Nov 2010 21:43:57 +0000 (21:43 +0000)
Bye, bye, winebuild. Welcome spec2def.

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

CMakeLists.txt
CMakeMacros.cmake
gcc.cmake

index e80ffad..3835afb 100644 (file)
@@ -41,9 +41,9 @@ add_subdirectory(tools)
 add_subdirectory(lib)
 
 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()
-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()
 
 else()
index 164d7a6..b2a7c68 100644 (file)
@@ -61,7 +61,7 @@ MACRO(CreateBootSectorTarget _target_name _asm_file _object_file)
     add_custom_command(\r
         OUTPUT ${_object_file}\r
         COMMAND nasm -o ${_object_file} ${result_incs} ${result_defs} -f bin ${_asm_file}\r
-        DEPENDS native-winebuild)\r
+        DEPENDS ${_asm_file})\r
     set_source_files_properties(${_object_file} PROPERTIES GENERATED TRUE)\r
     add_custom_target(${_target_name} ALL DEPENDS ${_object_file})\r
     add_minicd(${_object_file} loader ${OBJECT_NAME})\r
index 7a8bd40..538bd47 100644 (file)
--- a/gcc.cmake
+++ b/gcc.cmake
@@ -158,10 +158,10 @@ macro(spec2def _dllname _spec_file)
     get_filename_component(_file ${_spec_file} NAME_WE)
     add_custom_command(
         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})
     set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_file}.def
-        PROPERTIES GENERATED TRUE EXTERNAL_OBJECT TRUE)
+        PROPERTIES GENERATED TRUE)
 endmacro()
 
 # Optional 3rd parameter: dllname