[CMAKE]

- unify spec2def and add_importlib_target, thanks to cmake_parse_arguments. - also generate stub files only when necessary. - better precompiled header support, commented out as it wasn't tested on any other machine than mine, and it depends on cmake features which don't exist yet. For now only for gcc toolchain svn path=/trunk/; revision=52460
2026-09-02 04:13:34 +00:00 · 2011-06-25 18:34:03 +00:00
parent efd8902582
commit 01a4049405
201 changed files with 300 additions and 257 deletions
@@ -12,7 +12,6 @@ add_definitions(
    -DWIN32
    -D__WINDRES__)

-#add_pch(explorer precomp.h)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})

 list(APPEND SOURCE
@@ -66,6 +65,10 @@ target_link_libraries(explorer
    uuid)

 add_importlibs(explorer advapi32 gdi32 user32 ws2_32 msimg32 comctl32 ole32 oleaut32 shell32 notifyhook msvcrt kernel32 ntdll)
+#hack 
+set(IS_CPP 1)
+add_pch(explorer precomp.h)
+set(IS_CPP)
 set_image_base(explorer 0x00400000)
 add_dependencies(explorer psdk)
 add_cd_file(TARGET explorer DESTINATION reactos FOR all)
@@ -1,7 +1,7 @@

 add_definitions(-D_NOTIFYHOOK_IMPL)

-spec2def(notifyhook.dll notifyhook.spec)
+spec2def(notifyhook.dll notifyhook.spec ADD_IMPORTLIB)

 list(APPEND SOURCE
    notifyhook.c
@@ -221,68 +221,86 @@ endif()

 macro(add_importlib_target _exports_file)

-    get_filename_component(_name ${_exports_file} NAME_WE)
-    get_filename_component(_extension ${_exports_file} EXT)
-    get_target_property(_suffix ${_name} SUFFIX)
-    if(${_suffix} STREQUAL "_suffix-NOTFOUND")
-        get_target_property(_type ${_name} TYPE)
-        if(${_type} MATCHES EXECUTABLE)
-            set(_suffix ".exe")
-        else()
-            set(_suffix ".dll")
-        endif()
-    endif()
+    # get_filename_component(_name ${_exports_file} NAME_WE)
+    # get_filename_component(_extension ${_exports_file} EXT)
+    # get_target_property(_suffix ${_name} SUFFIX)
+    # if(${_suffix} STREQUAL "_suffix-NOTFOUND")
+        # get_target_property(_type ${_name} TYPE)
+        # if(${_type} MATCHES EXECUTABLE)
+            # set(_suffix ".exe")
+        # else()
+            # set(_suffix ".dll")
+        # endif()
+    # endif()

-    if (${_extension} STREQUAL ".spec")
+    # if (${_extension} STREQUAL ".spec")

-        # Normal importlib creation
-        add_custom_command(
-            OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a
-            COMMAND native-spec2def -n=${_name}${_suffix} -a=${ARCH2} -d=${CMAKE_CURRENT_BINARY_DIR}/${_name}_implib.def ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file}
-            COMMAND ${MINGW_PREFIX}dlltool --def ${CMAKE_CURRENT_BINARY_DIR}/${_name}_implib.def --kill-at --output-lib=${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a
-            DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file})
+        # # Normal importlib creation
+        # add_custom_command(
+            # OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a
+            # COMMAND native-spec2def -n=${_name}${_suffix} -a=${ARCH2} -d=${CMAKE_CURRENT_BINARY_DIR}/${_name}_implib.def ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file}
+            # COMMAND ${MINGW_PREFIX}dlltool --def ${CMAKE_CURRENT_BINARY_DIR}/${_name}_implib.def --kill-at --output-lib=${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a
+            # DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file})

-        # Delayed importlib creation
-        add_custom_command(
-            OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_delayed.a
-            COMMAND native-spec2def -n=${_name}${_suffix} -a=${ARCH2} -d=${CMAKE_CURRENT_BINARY_DIR}/${_name}_delayed_implib.def ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file}
-            COMMAND ${MINGW_PREFIX}dlltool --def ${CMAKE_CURRENT_BINARY_DIR}/${_name}_delayed_implib.def --kill-at --output-delaylib ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_delayed.a
-            DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file})
+        # # Delayed importlib creation
+        # add_custom_command(
+            # OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_delayed.a
+            # COMMAND native-spec2def -n=${_name}${_suffix} -a=${ARCH2} -d=${CMAKE_CURRENT_BINARY_DIR}/${_name}_delayed_implib.def ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file}
+            # COMMAND ${MINGW_PREFIX}dlltool --def ${CMAKE_CURRENT_BINARY_DIR}/${_name}_delayed_implib.def --kill-at --output-delaylib ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_delayed.a
+            # DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file})

-    elseif(${_extension} STREQUAL ".def")
-        message("Use of def files for import libs is deprecated: ${_exports_file}")
-        add_custom_command(
-            OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a
-            COMMAND ${MINGW_PREFIX}dlltool --def ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} --kill-at --output-lib=${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a
-            DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file})
-        add_custom_command(
-            OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_delayed.a
-            COMMAND ${MINGW_PREFIX}dlltool --def ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} --kill-at --output-delaylib ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_delayed.a
-            DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file})
-    else()
-        message(FATAL_ERROR "Unsupported exports file extension: ${_extension}")
-    endif()
+    # elseif(${_extension} STREQUAL ".def")
+        # message("Use of def files for import libs is deprecated: ${_exports_file}")
+        # add_custom_command(
+            # OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a
+            # COMMAND ${MINGW_PREFIX}dlltool --def ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} --kill-at --output-lib=${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a
+            # DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file})
+        # add_custom_command(
+            # OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_delayed.a
+            # COMMAND ${MINGW_PREFIX}dlltool --def ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} --kill-at --output-delaylib ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_delayed.a
+            # DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file})
+    # else()
+        # message(FATAL_ERROR "Unsupported exports file extension: ${_extension}")
+    # endif()

-    # Normal importlib target
-    add_custom_target(
-        lib${_name}
-        DEPENDS ${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a)
-    # Delayed importlib target
-    add_custom_target(
-        lib${_name}_delayed
-        DEPENDS ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_delayed.a)
+    # # Normal importlib target
+    # add_custom_target(
+        # lib${_name}
+        # DEPENDS ${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a)
+    # # Delayed importlib target
+    # add_custom_target(
+        # lib${_name}_delayed
+        # DEPENDS ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_delayed.a)

 endmacro()

 macro(spec2def _dllname _spec_file)
+    cmake_parse_arguments(__s2d "ADD_IMPORTLIB;GENERATE_STUBS" "" "" ${ARGN})
    get_filename_component(_file ${_spec_file} NAME_WE)
+    list(APPEND __output ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def)
+    list(APPEND __args -n=${_dllname} -a=${ARCH2} -d=${CMAKE_CURRENT_BINARY_DIR}/${_file}.def)
+    #Generate stubs only if needed
+    if(__s2d_GENERATE_STUBS)
+        list(APPEND __output ${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c)
+        list(APPEND __args -s=${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c)
+        set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c PROPERTIES GENERATED TRUE)
+    endif()
    add_custom_command(
-        OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def ${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c
-        COMMAND native-spec2def -n=${_dllname} --kill-at -a=${ARCH2} -d=${CMAKE_CURRENT_BINARY_DIR}/${_file}.def -s=${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file}
+        OUTPUT ${__output}
+        COMMAND native-spec2def ${__args} ${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)
-    set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c PROPERTIES GENERATED TRUE)
+        PROPERTIES EXTERNAL_OBJECT TRUE)
+    if(__s2d_ADD_IMPORTLIB)
+        get_filename_component(_name ${_dllname} NAME_WE)
+        add_custom_target(lib${_name}
+            COMMAND ${MINGW_PREFIX}dlltool --def ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def --kill-at --output-lib=${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a
+            DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def)
+        add_custom_target(lib${_name}_delayed
+            COMMAND ${MINGW_PREFIX}dlltool --def ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def --kill-at --output-delaylib=${CMAKE_BINARY_DIR}/importlibs/lib${_name}_delayed.a
+            DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def)
+    endif()
+    
 endmacro()

 macro(macro_mc FILE)
@@ -316,20 +334,42 @@ macro(_PCH_GET_COMPILE_FLAGS _target_name _out_compile_flags _header_filename)
            list(APPEND ${_out_compile_flags} -D${item})
        endforeach()
    endif()
+	
+	if(IS_CPP)
+		list(APPEND ${_out_compile_flags} ${CMAKE_CXX_FLAGS})
+	else()
+		list(APPEND ${_out_compile_flags} ${CMAKE_C_FLAGS})
+	endif()

 	separate_arguments(${_out_compile_flags})
 endmacro()

 macro(add_pch _target_name _FILE)
-	#set(_header_filename ${CMAKE_CURRENT_SOURCE_DIR}/${_FILE})
-	#get_filename_component(_basename ${_FILE} NAME)
-    #set(_gch_filename ${_basename}.gch)
-    #_PCH_GET_COMPILE_FLAGS(${_target_name} _args ${_header_filename})
+if(__some_non_existent_variable)
+	set(_header_filename ${CMAKE_CURRENT_SOURCE_DIR}/${_FILE})
+	get_filename_component(_basename ${_FILE} NAME)
+    set(_gch_filename ${_basename}.gch)
+    _PCH_GET_COMPILE_FLAGS(${_target_name} _args ${_header_filename})
+	
+	if(IS_CPP)
+		set(__lang CXX)
+		set(__compiler ${CMAKE_CXX_COMPILER} ${CMAKE_CXX_COMPILER_ARG1})
+	else()
+		set(__lang C)
+		set(__compiler ${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_ARG1})
+	endif()

-    #add_custom_command(OUTPUT ${_gch_filename} COMMAND ${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_ARG1} ${_args} DEPENDS ${_header_filename})
-	#get_target_property(_src_files ${_target_name} SOURCES)
-	#set_source_files_properties(${_src_files} PROPERTIES COMPILE_FLAGS "-Winvalid-pch -fpch-preprocess" #OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_gch_filename})
-	#add_linkerflag(${_target_name} "${_gch_filename}")
+    add_custom_command(OUTPUT ${_gch_filename} COMMAND ${__compiler} ${_args} IMPLICIT_DEPENDS ${__lang} ${_header_filename})
+	get_target_property(_src_files ${_target_name} SOURCES)
+	foreach(_item in ${_src_files})
+		get_source_file_property(__src_lang ${_item} LANGUAGE)
+		if(__src_lang STREQUAL __lang)
+			set_source_files_properties(${_item} PROPERTIES COMPILE_FLAGS "-Winvalid-pch -fpch-preprocess" OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_gch_filename})
+		endif()
+	endforeach()
+	#set dependency checking : depends on precompiled header only whixh already depends on deeper header
+	set_target_properties(${_target_name} PROPERTIES IMPLICIT_DEPENDS_INCLUDE_TRANSFORM "\"${_basename}\"=;<${_basename}>=")
+endif()
 endmacro()

 macro(CreateBootSectorTarget _target_name _asm_file _object_file _base_address)
@@ -4,7 +4,7 @@ set_rc_compiler()

 include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine)

-spec2def(inetcpl.cpl inetcpl.spec)
+spec2def(inetcpl.cpl inetcpl.spec GENERATE_STUBS)

 list(APPEND SOURCE
    inetcpl.c
@@ -6,7 +6,7 @@ add_definitions(-D_WIN32_WINNT=0x600)

 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)

-spec2def(dinput.dll dinput.spec)
+spec2def(dinput.dll dinput.spec ADD_IMPORTLIB)

 add_library(dinput SHARED
    data_formats.c
@@ -6,7 +6,7 @@ add_definitions(-D_WIN32_WINNT=0x600)

 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)

-spec2def(dinput8.dll dinput8.spec)
+spec2def(dinput8.dll dinput8.spec ADD_IMPORTLIB)

 add_library(dinput8 SHARED
    dinput8_main.c
@@ -3,7 +3,7 @@ set_unicode()

 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)

-spec2def(dplay.dll dplay.spec)
+spec2def(dplay.dll dplay.spec ADD_IMPORTLIB)

 add_library(dplay SHARED
    dplay_main.c
@@ -1,7 +1,7 @@

 set_rc_compiler()

-spec2def(dplayx.dll dplayx.spec)
+spec2def(dplayx.dll dplayx.spec ADD_IMPORTLIB)

 list(APPEND SOURCE
    dpclassfactory.c
@@ -5,7 +5,7 @@ add_definitions(

 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)

-spec2def(dsound.dll dsound.spec)
+spec2def(dsound.dll dsound.spec ADD_IMPORTLIB)

 add_library(dsound SHARED
    buffer.c
@@ -1,5 +1,5 @@

-spec2def(ksuser.dll ksuser.spec)
+spec2def(ksuser.dll ksuser.spec ADD_IMPORTLIB)

 add_library(ksuser SHARED ksuser.c ksuser.rc ${CMAKE_CURRENT_BINARY_DIR}/ksuser.def)

@@ -9,7 +9,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)

 set_rc_compiler()

-spec2def(d3d9.dll d3d9.spec)
+spec2def(d3d9.dll d3d9.spec ADD_IMPORTLIB GENERATE_STUBS)

 list(APPEND SOURCE
    buffer.c
@@ -1,6 +1,6 @@
 set_rc_compiler()

-spec2def(d3dx9_24.dll d3dx9_24.spec)
+spec2def(d3dx9_24.dll d3dx9_24.spec ADD_IMPORTLIB GENERATE_STUBS)

 list(APPEND SOURCE
    d3dx9_24_main.c
@@ -1,6 +1,6 @@
 set_rc_compiler()

-spec2def(d3dx9_25.dll d3dx9_25.spec)
+spec2def(d3dx9_25.dll d3dx9_25.spec ADD_IMPORTLIB GENERATE_STUBS)

 list(APPEND SOURCE
    d3dx9_25_main.c
@@ -1,6 +1,6 @@
 set_rc_compiler()

-spec2def(d3dx9_26.dll d3dx9_26.spec)
+spec2def(d3dx9_26.dll d3dx9_26.spec GENERATE_STUBS)

 list(APPEND SOURCE
    d3dx9_26_main.c
@@ -1,6 +1,6 @@
 set_rc_compiler()

-spec2def(d3dx9_27.dll d3dx9_27.spec)
+spec2def(d3dx9_27.dll d3dx9_27.spec GENERATE_STUBS)

 list(APPEND SOURCE
    d3dx9_27_main.c
@@ -1,6 +1,6 @@
 set_rc_compiler()

-spec2def(d3dx9_28.dll d3dx9_28.spec)
+spec2def(d3dx9_28.dll d3dx9_28.spec GENERATE_STUBS)

 list(APPEND SOURCE
    d3dx9_28_main.c
@@ -1,6 +1,6 @@
 set_rc_compiler()

-spec2def(d3dx9_29.dll d3dx9_29.spec)
+spec2def(d3dx9_29.dll d3dx9_29.spec GENERATE_STUBS)

 list(APPEND SOURCE
    d3dx9_29_main.c
@@ -1,6 +1,6 @@
 set_rc_compiler()

-spec2def(d3dx9_30.dll d3dx9_30.spec)
+spec2def(d3dx9_30.dll d3dx9_30.spec GENERATE_STUBS)

 list(APPEND SOURCE
    d3dx9_30_main.c
@@ -1,6 +1,6 @@
 set_rc_compiler()

-spec2def(d3dx9_31.dll d3dx9_31.spec)
+spec2def(d3dx9_31.dll d3dx9_31.spec GENERATE_STUBS)

 list(APPEND SOURCE
    d3dx9_31_main.c
@@ -1,6 +1,6 @@
 set_rc_compiler()

-spec2def(d3dx9_32.dll d3dx9_32.spec)
+spec2def(d3dx9_32.dll d3dx9_32.spec GENERATE_STUBS)

 list(APPEND SOURCE
    d3dx9_32_main.c
@@ -1,6 +1,6 @@
 set_rc_compiler()

-spec2def(d3dx9_33.dll d3dx9_33.spec)
+spec2def(d3dx9_33.dll d3dx9_33.spec GENERATE_STUBS)

 list(APPEND SOURCE
    d3dx9_33_main.c
@@ -1,6 +1,6 @@
 set_rc_compiler()

-spec2def(d3dx9_34.dll d3dx9_34.spec)
+spec2def(d3dx9_34.dll d3dx9_34.spec GENERATE_STUBS)

 list(APPEND SOURCE
    d3dx9_34_main.c
@@ -1,6 +1,6 @@
 set_rc_compiler()

-spec2def(d3dx9_36.dll d3dx9_36.spec)
+spec2def(d3dx9_36.dll d3dx9_36.spec ADD_IMPORTLIB GENERATE_STUBS)

 list(APPEND SOURCE
    core.c
@@ -11,7 +11,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)

 set_rc_compiler()

-spec2def(ddraw.dll ddraw.spec)
+spec2def(ddraw.dll ddraw.spec ADD_IMPORTLIB GENERATE_STUBS)

 list(APPEND SOURCE
    clipper.c
@@ -13,7 +13,7 @@ if(MSVC)
    add_definitions(-Disinf=!_finite)
 endif()

-spec2def(wined3d.dll wined3d.spec)
+spec2def(wined3d.dll wined3d.spec ADD_IMPORTLIB)

 list(APPEND SOURCE
    ati_fragment_shader.c
@@ -1,5 +1,5 @@

-spec2def(ntdll.dll def/ntdll.spec)
+spec2def(ntdll.dll def/ntdll.spec ADD_IMPORTLIB)

 add_definitions(
    -D__NTDLL__
@@ -1,7 +1,7 @@

 set_unicode()
 set_rc_compiler()
-spec2def(acledit.dll acledit.spec)
+spec2def(acledit.dll acledit.spec ADD_IMPORTLIB)

 list(APPEND SOURCE
    acledit.c
@@ -1,5 +1,5 @@

-spec2def(aclui.dll aclui.spec)
+spec2def(aclui.dll aclui.spec ADD_IMPORTLIB)
 set_rc_compiler()
 set_unicode()

@@ -1,7 +1,7 @@

 set_unicode()

-spec2def(advapi32.dll advapi32.spec)
+spec2def(advapi32.dll advapi32.spec ADD_IMPORTLIB GENERATE_STUBS)

 add_definitions(-D_ADVAPI32_)

@@ -10,7 +10,7 @@ add_idl_headers(atl_atliface_header atliface.idl)
 generate_idl_iids(atliface.idl)

 set_rc_compiler()
-spec2def(atl.dll atl.spec)
+spec2def(atl.dll atl.spec ADD_IMPORTLIB)

 list(APPEND SOURCE
    atl_ax.c
@@ -1,7 +1,7 @@

 set_unicode()

-spec2def(authz.dll authz.spec)
+spec2def(authz.dll authz.spec GENERATE_STUBS)

 list(APPEND SOURCE
    authz.c
@@ -1,5 +1,5 @@

-spec2def(avicap32.dll avicap32.spec)
+spec2def(avicap32.dll avicap32.spec ADD_IMPORTLIB)

 set_unicode()

@@ -8,7 +8,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)

 set_rc_compiler()

-spec2def(avifil32.dll avifil32.spec)
+spec2def(avifil32.dll avifil32.spec ADD_IMPORTLIB)

 add_library(avifil32 SHARED
    acmstream.c
@@ -1,5 +1,5 @@

-spec2def(batt.dll batt.spec)
+spec2def(batt.dll batt.spec ADD_IMPORTLIB)

 set_unicode()
 set_rc_compiler()
@@ -3,7 +3,7 @@ add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)

 set_rc_compiler()
-spec2def(bcrypt.dll bcrypt.spec)
+spec2def(bcrypt.dll bcrypt.spec GENERATE_STUBS)

 list(APPEND SOURCE
    bcrypt_main.c
@@ -1,7 +1,7 @@

 set_unicode()

-spec2def(beepmidi.dll beepmidi.spec)
+spec2def(beepmidi.dll beepmidi.spec ADD_IMPORTLIB)

 list(APPEND SOURCE
    beepmidi.c
@@ -3,7 +3,7 @@ add_definitions(-D__WINESRC__)

 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)

-spec2def(cabinet.dll cabinet.spec)
+spec2def(cabinet.dll cabinet.spec ADD_IMPORTLIB)

 list(APPEND SOURCE
    cabinet_main.c
@@ -6,7 +6,7 @@ add_definitions(-DCARDSTYLE_DEFAULT)

 set_rc_compiler()

-spec2def(cards.dll cards.spec)
+spec2def(cards.dll cards.spec ADD_IMPORTLIB)

 list(APPEND SOURCE
    cards.c
@@ -1,5 +1,5 @@

-spec2def(cfgmgr32.dll cfgmgr32.spec)
+spec2def(cfgmgr32.dll cfgmgr32.spec GENERATE_STUBS)

 list(APPEND SOURCE
    cfgmgr32.rc
@@ -4,7 +4,7 @@ add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)

 set_rc_compiler()
-spec2def(clusapi.dll clusapi.spec)
+spec2def(clusapi.dll clusapi.spec GENERATE_STUBS)

 list(APPEND SOURCE
    clusapi.c
@@ -12,7 +12,7 @@ add_definitions(-D_WIN32_WINNT=0x600)

 include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine)

-spec2def(comctl32.dll comctl32.spec)
+spec2def(comctl32.dll comctl32.spec ADD_IMPORTLIB)

 list(APPEND SOURCE
    animate.c
@@ -7,7 +7,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)

 set_rc_compiler()

-spec2def(comdlg32.dll comdlg32.spec)
+spec2def(comdlg32.dll comdlg32.spec ADD_IMPORTLIB GENERATE_STUBS)

 list(APPEND SOURCE
    cdlg32.c
@@ -3,7 +3,7 @@ add_definitions(-D__WINESRC__)

 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)

-spec2def(compstui.dll compstui.spec)
+spec2def(compstui.dll compstui.spec ADD_IMPORTLIB)

 list(APPEND SOURCE
    compstui_main.c
@@ -5,7 +5,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)

 set_rc_compiler()

-spec2def(credui.dll credui.spec)
+spec2def(credui.dll credui.spec ADD_IMPORTLIB GENERATE_STUBS)

 list(APPEND SOURCE
    credui_main.c
@@ -10,7 +10,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)

 set_rc_compiler()

-spec2def(crypt32.dll crypt32.spec)
+spec2def(crypt32.dll crypt32.spec ADD_IMPORTLIB GENERATE_STUBS)

 list(APPEND SOURCE
    base64.c
@@ -4,7 +4,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)

 set_rc_compiler()

-spec2def(cryptdlg.dll cryptdlg.spec)
+spec2def(cryptdlg.dll cryptdlg.spec GENERATE_STUBS)

 list(APPEND SOURCE
    main.c
@@ -2,7 +2,7 @@
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)

-spec2def(cryptnet.dll cryptnet.spec)
+spec2def(cryptnet.dll cryptnet.spec ADD_IMPORTLIB GENERATE_STUBS)

 list(APPEND SOURCE
    cryptnet_main.c
@@ -7,7 +7,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)

 set_rc_compiler()

-spec2def(cryptui.dll cryptui.spec)
+spec2def(cryptui.dll cryptui.spec ADD_IMPORTLIB GENERATE_STUBS)

 list(APPEND SOURCE
    main.c
@@ -14,7 +14,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)

 set_rc_compiler()

-spec2def(dbghelp.dll dbghelp.spec)
+spec2def(dbghelp.dll dbghelp.spec ADD_IMPORTLIB GENERATE_STUBS)

 list(APPEND SOURCE
    coff.c
@@ -5,7 +5,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)

 set_rc_compiler()

-spec2def(dciman32.dll dciman32.spec)
+spec2def(dciman32.dll dciman32.spec GENERATE_STUBS)

 list(APPEND SOURCE
    dciman_main.c
@@ -2,7 +2,7 @@
 set_unicode()
 set_rc_compiler()

-spec2def(devmgr.dll devmgr.spec)
+spec2def(devmgr.dll devmgr.spec ADD_IMPORTLIB GENERATE_STUBS)

 list(APPEND SOURCE
    devmgr.rc
@@ -3,7 +3,7 @@ add_definitions(-Dtzset=_tzset)

 include_directories(include)

-spec2def(dhcpcsvc.dll dhcpcsvc.spec)
+spec2def(dhcpcsvc.dll dhcpcsvc.spec ADD_IMPORTLIB GENERATE_STUBS)

 list(APPEND SOURCE 
    dhcp/adapter.c
@@ -6,7 +6,7 @@ include_directories(

 add_definitions(-DADNS_JGAA_WIN32)

-spec2def(dnsapi.dll dnsapi.spec)
+spec2def(dnsapi.dll dnsapi.spec ADD_IMPORTLIB)

 list(APPEND SOURCE
    dnsapi/adns.c
@@ -5,7 +5,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)

 set_rc_compiler()

-spec2def(dwmapi.dll dwmapi.spec)
+spec2def(dwmapi.dll dwmapi.spec GENERATE_STUBS)

 list(APPEND SOURCE
    dwmapi_main.c
@@ -5,7 +5,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)

 set_rc_compiler()

-spec2def(faultrep.dll faultrep.spec)
+spec2def(faultrep.dll faultrep.spec GENERATE_STUBS)

 list(APPEND SOURCE
    faultrep.c
@@ -1,5 +1,5 @@

-spec2def(fmifs.dll fmifs.spec)
+spec2def(fmifs.dll fmifs.spec ADD_IMPORTLIB GENERATE_STUBS)

 list(APPEND SOURCE
    chkdsk.c
@@ -5,7 +5,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)

 set_rc_compiler()

-spec2def(fusion.dll fusion.spec)
+spec2def(fusion.dll fusion.spec GENERATE_STUBS)

 list(APPEND SOURCE
    asmcache.c
@@ -5,7 +5,7 @@ add_definitions(-DLANGPACK)

 include_directories(include)

-spec2def(gdi32.dll gdi32.spec)
+spec2def(gdi32.dll gdi32.spec ADD_IMPORTLIB)

 if(ARCH MATCHES i386)
    list(APPEND SOURCE
@@ -7,7 +7,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)

 set_rc_compiler()

-spec2def(gdiplus.dll gdiplus.spec)
+spec2def(gdiplus.dll gdiplus.spec ADD_IMPORTLIB GENERATE_STUBS)

 list(APPEND SOURCE
    brush.c
@@ -3,7 +3,7 @@ set_unicode()

 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)

-spec2def(getuname.dll getuname.spec)
+spec2def(getuname.dll getuname.spec ADD_IMPORTLIB)

 add_library(getuname SHARED
    getuname.c
@@ -12,7 +12,7 @@ include_directories(
    libtess
    libutil)

-spec2def(glu32.dll glu32.spec)
+spec2def(glu32.dll glu32.spec ADD_IMPORTLIB)

 list(APPEND SOURCE
    libnurbs/interface/bezierEval.cc
@@ -2,7 +2,7 @@
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)

-spec2def(hlink.dll hlink.spec)
+spec2def(hlink.dll hlink.spec ADD_IMPORTLIB GENERATE_STUBS)

 list(APPEND SOURCE
    browse_ctx.c
@@ -3,7 +3,7 @@ add_definitions(-D__WINESRC__)

 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)

-spec2def(httpapi.dll httpapi.spec)
+spec2def(httpapi.dll httpapi.spec GENERATE_STUBS)

 list(APPEND SOURCE
    httpapi_main.c
@@ -3,7 +3,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)

 set_rc_compiler()

-spec2def(icmp.dll icmp.spec)
+spec2def(icmp.dll icmp.spec ADD_IMPORTLIB GENERATE_STUBS)

 list(APPEND SOURCE
    icmp_main.c
@@ -2,7 +2,7 @@
 add_definitions(-D_IMAGEHLP_SOURCE_)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)

-spec2def(imagehlp.dll imagehlp.spec)
+spec2def(imagehlp.dll imagehlp.spec ADD_IMPORTLIB GENERATE_STUBS)

 list(APPEND SOURCE
    access.c
@@ -12,7 +12,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)

 set_rc_compiler()

-spec2def(imm32.dll imm32.spec)
+spec2def(imm32.dll imm32.spec ADD_IMPORTLIB GENERATE_STUBS)

 list(APPEND SOURCE
    imm.c
@@ -6,7 +6,7 @@ add_definitions(-D_WIN32_WINNT=0x600)

 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)

-spec2def(inetcomm.dll inetcomm.spec)
+spec2def(inetcomm.dll inetcomm.spec ADD_IMPORTLIB GENERATE_STUBS)

 list(APPEND SOURCE
    imaptransport.c
@@ -2,7 +2,7 @@
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)

-spec2def(inetmib1.dll inetmib1.spec)
+spec2def(inetmib1.dll inetmib1.spec GENERATE_STUBS)

 list(APPEND SOURCE
    main.c 
@@ -3,7 +3,7 @@ add_definitions(-D__WINESRC__)

 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)

-spec2def(initpki.dll initpki.spec)
+spec2def(initpki.dll initpki.spec GENERATE_STUBS)

 list(APPEND SOURCE
    main.c
@@ -6,7 +6,7 @@ add_definitions(-D_WIN32_WINNT=0x600)

 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)

-spec2def(inseng.dll inseng.spec)
+spec2def(inseng.dll inseng.spec GENERATE_STUBS)

 list(APPEND SOURCE
    inseng_main.c
@@ -6,7 +6,7 @@ include_directories(
    ${REACTOS_SOURCE_DIR}/dll/win32/dhcpcsvc/include
    ${REACTOS_SOURCE_DIR}/lib/tdilib)

-spec2def(iphlpapi.dll iphlpapi.spec)
+spec2def(iphlpapi.dll iphlpapi.spec ADD_IMPORTLIB GENERATE_STUBS)

 list(APPEND SOURCE
    dhcp_reactos.c
@@ -2,7 +2,7 @@
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)

-spec2def(itircl.dll itircl.spec)
+spec2def(itircl.dll itircl.spec GENERATE_STUBS)

 list(APPEND SOURCE
    itircl_main.c
@@ -4,7 +4,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)

 set_rc_compiler()

-spec2def(itss.dll itss.spec)
+spec2def(itss.dll itss.spec GENERATE_STUBS)

 list(APPEND SOURCE
    chm_lib.c
@@ -8,7 +8,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys)

 set_rc_compiler()

-spec2def(kernel32.dll kernel32.spec)
+spec2def(kernel32.dll kernel32.spec ADD_IMPORTLIB)

 list(APPEND SOURCE
    debug/debugger.c
@@ -2,7 +2,7 @@
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)

-spec2def(loadperf.dll loadperf.spec)
+spec2def(loadperf.dll loadperf.spec ADD_IMPORTLIB)

 add_library(loadperf SHARED
            loadperf_main.c
@@ -8,7 +8,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)

 set_rc_compiler()

-spec2def(localspl.dll localspl.spec)
+spec2def(localspl.dll localspl.spec GENERATE_STUBS)

 list(APPEND SOURCE
    localmon.c
@@ -4,7 +4,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)

 set_rc_compiler()

-spec2def(localui.dll localui.spec)
+spec2def(localui.dll localui.spec ADD_IMPORTLIB)

 list(APPEND SOURCE
    localui.c
@@ -4,7 +4,7 @@ set_unicode()
 add_definitions(-DLANGPACK)
 include_directories(include)

-spec2def(lpk.dll lpk.spec)
+spec2def(lpk.dll lpk.spec ADD_IMPORTLIB)

 list(APPEND SOURCE
    dllmain.c
@@ -7,7 +7,7 @@ include_directories(

 set_rc_compiler()

-spec2def(lsasrv.dll lsasrv.spec)
+spec2def(lsasrv.dll lsasrv.spec ADD_IMPORTLIB GENERATE_STUBS)

 list(APPEND SOURCE
    authport.c
@@ -2,7 +2,7 @@
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)

-spec2def(lz32.dll lz32.spec)
+spec2def(lz32.dll lz32.spec ADD_IMPORTLIB)

 list(APPEND SOURCE
    version.rc
@@ -4,7 +4,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)

 set_rc_compiler()

-spec2def(mapi32.dll mapi32.spec)
+spec2def(mapi32.dll mapi32.spec GENERATE_STUBS)

 list(APPEND SOURCE
    imalloc.c
@@ -6,7 +6,7 @@ add_definitions(-D_WIN32_WINNT=0x600)

 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)

-spec2def(mlang.dll mlang.spec)
+spec2def(mlang.dll mlang.spec ADD_IMPORTLIB GENERATE_STUBS)

 list(APPEND SOURCE
    mlang.c
@@ -2,7 +2,7 @@
 set_unicode()
 set_rc_compiler()

-spec2def(modemui.dll modemui.spec)
+spec2def(modemui.dll modemui.spec GENERATE_STUBS)

 list(APPEND SOURCE
    modemui.c
@@ -7,7 +7,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)

 set_rc_compiler()

-spec2def(mpr.dll mpr.spec)
+spec2def(mpr.dll mpr.spec ADD_IMPORTLIB GENERATE_STUBS)

 list(APPEND SOURCE
    auth.c
@@ -2,7 +2,7 @@
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)

-spec2def(mprapi.dll mprapi.spec)
+spec2def(mprapi.dll mprapi.spec GENERATE_STUBS)

 list(APPEND SOURCE
    mprapi.c
@@ -5,7 +5,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)

 set_rc_compiler()

-spec2def(msacm32.dll msacm32.spec)
+spec2def(msacm32.dll msacm32.spec ADD_IMPORTLIB GENERATE_STUBS)

 list(APPEND SOURCE
    driver.c
@@ -4,7 +4,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)

 set_rc_compiler()

-spec2def(mscms.dll mscms.spec)
+spec2def(mscms.dll mscms.spec GENERATE_STUBS)

 list(APPEND SOURCE
    handle.c
@@ -2,7 +2,7 @@
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)

-spec2def(mscoree.dll mscoree.spec)
+spec2def(mscoree.dll mscoree.spec GENERATE_STUBS)

 list(APPEND SOURCE
    corruntimehost.c
@@ -8,7 +8,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)

 set_rc_compiler()

-spec2def(msctf.dll msctf.spec)
+spec2def(msctf.dll msctf.spec GENERATE_STUBS)

 list(APPEND SOURCE
    categorymgr.c
@@ -4,7 +4,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)

 set_rc_compiler()

-spec2def(msftedit.dll msftedit.spec)
+spec2def(msftedit.dll msftedit.spec GENERATE_STUBS)

 list(APPEND SOURCE
    msftedit_main.c
@@ -5,7 +5,7 @@ include_directories(

 set_rc_compiler()

-spec2def(msgina.dll msgina.spec)
+spec2def(msgina.dll msgina.spec GENERATE_STUBS)

 list(APPEND SOURCE
    gui.c
@@ -9,7 +9,7 @@ add_idl_Headers(mshtml_nsiface_header nsiface.idl)

 set_rc_compiler()

-spec2def(mshtml.dll mshtml.spec)
+spec2def(mshtml.dll mshtml.spec GENERATE_STUBS)

 list(APPEND SOURCE
    conpoint.c
@@ -6,7 +6,7 @@ remove_definitions(-D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x600)

 set_rc_compiler()
-spec2def(msi.dll msi.spec)
+spec2def(msi.dll msi.spec ADD_IMPORTLIB GENERATE_STUBS)

 generate_idl_iids(msiserver.idl)

@@ -2,7 +2,7 @@
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 add_definitions(-D__WINESRC__)

-spec2def(msimg32.dll msimg32.spec)
+spec2def(msimg32.dll msimg32.spec ADD_IMPORTLIB)

 list(APPEND SOURCE
    msimg32_main.c
@@ -4,7 +4,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)

 set_rc_compiler()

-spec2def(msimtf.dll msimtf.spec)
+spec2def(msimtf.dll msimtf.spec GENERATE_STUBS)

 list(APPEND SOURCE
    activeimmapp.c
@@ -2,7 +2,7 @@
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)

-spec2def(msisip.dll msisip.spec)
+spec2def(msisip.dll msisip.spec GENERATE_STUBS)

 list(APPEND SOURCE
    main.c
@@ -1,7 +1,7 @@

 set_unicode()

-spec2def(msports.dll msports.spec)
+spec2def(msports.dll msports.spec ADD_IMPORTLIB GENERATE_STUBS)

 list(APPEND SOURCE
    classinst.c
@@ -2,7 +2,7 @@
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 add_definitions(-D__WINESRC__)

-spec2def(mssign32.dll mssign32.spec)
+spec2def(mssign32.dll mssign32.spec GENERATE_STUBS)

 list(APPEND SOURCE
    mssign32_main.c
@@ -2,7 +2,7 @@
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 add_definitions(-D__WINESRC__)

-spec2def(mssip32.dll mssip32.spec)
+spec2def(mssip32.dll mssip32.spec GENERATE_STUBS)

 list(APPEND SOURCE
    main.c
@@ -13,7 +13,7 @@ set_rc_compiler()

 generate_idl_iids(mstask_local.idl)

-spec2def(mstask.dll mstask.spec)
+spec2def(mstask.dll mstask.spec GENERATE_STUBS)

 list(APPEND SOURCE
    factory.c
--- a/Show More
+++ b/Show More