[LOADPERF]

[reactos.git] / msc.cmake

diff --git a/msc.cmake b/msc.cmake
index e74ca7d..7ffb866 100644 (file)
--- a/msc.cmake
+++ b/msc.cmake
@@ -73,7 +73,6 @@ macro(set_module_type MODULE TYPE)
                        message(STATUS "${MODULE} has no base address")\r
                endif()\r
                target_link_libraries(${MODULE} mingw_common mingw_dllmain)\r
-               add_importlibs(${MODULE} msvcrt kernel32)\r
         add_linkerflag(${MODULE} "/DLL")\r
     endif()\r
 \r
@@ -105,38 +104,39 @@ 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-spec2pdef -s ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} ${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
         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-spec2pdef -n -r ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} ${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
         DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file})\r
 \r
     # Assemble the file\r
     add_custom_command(\r
         OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.obj\r
-        COMMAND ${CMAKE_ASM_COMPILER} /Fo${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.obj /c /Ta ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.asm\r
+        COMMAND ${CMAKE_ASM_COMPILER} /NOLOGO /Fo${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.obj /c /Ta ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.asm\r
         DEPENDS "${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.asm"\r
     )\r
 \r
     # Add neccessary importlibs for redirections\r
+    set(_libraries "")\r
     foreach(_lib ${ARGN})\r
         list(APPEND _libraries "${CMAKE_BINARY_DIR}/importlibs/${_lib}.lib")\r
     endforeach()\r
 \r
     # Build the importlib\r
     add_custom_command(\r
-        OUTPUT {CMAKE_BINARY_DIR}/importlibs/lib${_name}.lib\r
-        COMMAND LINK /LIB /MACHINE:X86 /DEF:${CMAKE_BINARY_DIR}/importlibs/lib${_name}_exp.def /OUT:${CMAKE_BINARY_DIR}/importlibs/lib${_name}.lib ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.obj ${_libraries}\r
-        DEPENDS "${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.obj" "${CMAKE_BINARY_DIR}/importlibs/lib${_name}_exp.def" ${_libraries}\r
+        OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}.lib\r
+        COMMAND LINK /LIB /NOLOGO /MACHINE:X86 /DEF:${CMAKE_BINARY_DIR}/importlibs/lib${_name}_exp.def /OUT:${CMAKE_BINARY_DIR}/importlibs/lib${_name}.lib ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.obj ${_libraries}\r
+        DEPENDS ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.obj ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_exp.def ${_libraries}\r
     )\r
 \r
     # Add the importlib target\r
     add_custom_target(\r
         lib${_name}\r
-        DEPENDS {CMAKE_BINARY_DIR}/importlibs/lib${_name}.lib\r
+        DEPENDS ${CMAKE_BINARY_DIR}/importlibs/lib${_name}.lib\r
     )\r
 endmacro()\r
 \r
@@ -147,32 +147,25 @@ macro(add_importlibs MODULE)
     endforeach()\r
 endmacro()\r
 \r
-MACRO(spec2def _dllname _spec_file)\r
+macro(spec2def _dllname _spec_file)\r
     get_filename_component(_file ${_spec_file} NAME_WE)\r
     add_custom_command(\r
         OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def\r
-        COMMAND native-spec2pdef -n  --dll ${_dllname} ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} ${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
         DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file})\r
     set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_file}.def\r
-        PROPERTIES GENERATED TRUE EXTERNAL_OBJECT TRUE)\r
-ENDMACRO(spec2def _dllname _spec_file)\r
+        PROPERTIES GENERATED TRUE)\r
+endmacro()\r
 \r
-macro(pdef2def _pdef_file)\r
-    get_filename_component(_file ${_pdef_file} NAME_WE)\r
-    add_custom_command(\r
-        OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def\r
-        COMMAND ${CMAKE_C_COMPILER} /EP /c ${CMAKE_CURRENT_SOURCE_DIR}/${_pdef_file} > ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def\r
-        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_pdef_file})\r
-    add_custom_target(\r
-        ${_file}_def\r
-        DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def)\r
-endmacro(pdef2def _pdef_file)\r
-\r
-macro(set_pdef_file _module _pdef_file)\r
-    pdef2def(${_pdef_file})\r
-    get_filename_component(_file ${_pdef_file} NAME_WE)\r
-    add_linkerflag(${_module} "/DEF:${CMAKE_CURRENT_BINARY_DIR}/${_file}.def")\r
-    add_dependencies(${_module} ${_file}_def)\r
+# Optional 3rd parameter: dllname\r
+macro(set_export_spec _module _spec_file)\r
+    get_filename_component(_file ${_spec_file} NAME_WE)\r
+    if (${ARGC} GREATER 2)\r
+        set(_dllname ${ARGV2})\r
+    else()\r
+        set(_dllname ${_file}.dll)\r
+    endif()\r
+    spec2def(${_dllname} ${_spec_file})\r
 endmacro()\r
 \r
 file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/importlibs)\r