From 8ee00e2746607c37dd96bfe90638739d9093babc Mon Sep 17 00:00:00 2001
From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Sat, 20 Nov 2010 21:43:57 +0000
Subject: [PATCH 1/1] [CMAKE] Bye, bye, winebuild. Welcome spec2def.

svn path=/branches/cmake-bringup/; revision=49675
---
 CMakeLists.txt    | 4 ++--
 CMakeMacros.cmake | 2 +-
 gcc.cmake         | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e80ffad4cec..3835afb00c6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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()
diff --git a/CMakeMacros.cmake b/CMakeMacros.cmake
index 164d7a6fe84..b2a7c6805d0 100644
--- a/CMakeMacros.cmake
+++ b/CMakeMacros.cmake
@@ -61,7 +61,7 @@ MACRO(CreateBootSectorTarget _target_name _asm_file _object_file)
     add_custom_command(
         OUTPUT ${_object_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)
     add_custom_target(${_target_name} ALL DEPENDS ${_object_file})
     add_minicd(${_object_file} loader ${OBJECT_NAME})
diff --git a/gcc.cmake b/gcc.cmake
index 7a8bd40348f..538bd47d6f7 100644
--- 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
-- 
2.17.1