[SPEC2DEF]
authorTimo Kreuzer <timo.kreuzer@reactos.org>
Mon, 29 Nov 2010 17:53:20 +0000 (17:53 +0000)
committerTimo Kreuzer <timo.kreuzer@reactos.org>
Mon, 29 Nov 2010 17:53:20 +0000 (17:53 +0000)
- add support for stubs generation
- add support for "proper" stubs, with calling convention and parameter dump
- handle -private
- change invokation a bit
[CMAKE]
- remove the old VARIANT hack

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

gcc.cmake
msc.cmake

index 30d8c4b..c01488c 100644 (file)
--- a/gcc.cmake
+++ b/gcc.cmake
@@ -201,7 +201,7 @@ 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-spec2def --dll ${_dllname} ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def
+        COMMAND native-spec2def -n=${_dllname} -d=${CMAKE_CURRENT_BINARY_DIR}/${_file}.def ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file}
         DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file})
     set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_file}.def
         PROPERTIES GENERATED TRUE EXTERNAL_OBJECT TRUE)
index 3e74724..6fa4fa4 100644 (file)
--- a/msc.cmake
+++ b/msc.cmake
@@ -131,7 +131,7 @@ endmacro()
 \r
 #idl files support\r
 set(IDL_COMPILER midl)\r
-set(IDL_FLAGS /win32 /DIEnumVARIANT=IEnumXVARIANT)\r
+set(IDL_FLAGS /win32)\r
 set(IDL_HEADER_ARG /h) #.h\r
 set(IDL_TYPELIB_ARG /tlb) #.tlb\r
 set(IDL_SERVER_ARG /sstub) #.c for stub server library\r
@@ -146,13 +146,13 @@ macro(add_importlib_target _spec_file)
     # Generate the asm stub file\r
     add_custom_command(\r
         OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.asm\r
-        COMMAND native-spec2def -s ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.asm\r
+        COMMAND native-spec2def -l=${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.asm ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file}\r
         DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file})\r
 \r
     # Generate a the export def file\r
     add_custom_command(\r
         OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_exp.def\r
-        COMMAND native-spec2def -n -r ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_exp.def\r
+        COMMAND native-spec2def -@ -r -d=${CMAKE_BINARY_DIR}/importlibs/lib${_name}_exp.def ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file}\r
         DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file})\r
 \r
     # Assemble the file\r
@@ -196,7 +196,7 @@ macro(spec2def _dllname _spec_file)
     get_filename_component(_file ${_spec_file} NAME_WE)\r
     add_custom_command(\r
         OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def\r
-        COMMAND native-spec2def -n --dll ${_dllname} ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def\r
+        COMMAND native-spec2def -@ -n=${_dllname} -d=${CMAKE_CURRENT_BINARY_DIR}/${_file}.def ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file}\r
         DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file})\r
     set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_file}.def\r
         PROPERTIES GENERATED TRUE)\r