From 871ee92c7bb57220f3cf4061e7db151f79180690 Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Sun, 26 Jun 2011 21:29:55 +0000 Subject: [PATCH] [CMAKE] revert r52460, r52463, r52468 on behalf of Jerome it wrongly gave name decorations to export svn path=/trunk/; revision=52473 --- reactos/base/shell/explorer/CMakeLists.txt | 5 +- .../shell/explorer/notifyhook/CMakeLists.txt | 2 +- reactos/cmake/gcc.cmake | 113 ++++++------------ reactos/dll/cpl/inetcpl/CMakeLists.txt | 2 +- reactos/dll/directx/dinput/CMakeLists.txt | 2 +- reactos/dll/directx/dinput8/CMakeLists.txt | 2 +- reactos/dll/directx/dplay/CMakeLists.txt | 2 +- reactos/dll/directx/dplayx/CMakeLists.txt | 2 +- reactos/dll/directx/dsound/CMakeLists.txt | 2 +- reactos/dll/directx/ksuser/CMakeLists.txt | 2 +- reactos/dll/directx/wine/d3d9/CMakeLists.txt | 2 +- .../dll/directx/wine/d3dx9_24/CMakeLists.txt | 2 +- .../dll/directx/wine/d3dx9_25/CMakeLists.txt | 2 +- .../dll/directx/wine/d3dx9_26/CMakeLists.txt | 2 +- .../dll/directx/wine/d3dx9_27/CMakeLists.txt | 2 +- .../dll/directx/wine/d3dx9_28/CMakeLists.txt | 2 +- .../dll/directx/wine/d3dx9_29/CMakeLists.txt | 2 +- .../dll/directx/wine/d3dx9_30/CMakeLists.txt | 2 +- .../dll/directx/wine/d3dx9_31/CMakeLists.txt | 2 +- .../dll/directx/wine/d3dx9_32/CMakeLists.txt | 2 +- .../dll/directx/wine/d3dx9_33/CMakeLists.txt | 2 +- .../dll/directx/wine/d3dx9_34/CMakeLists.txt | 2 +- .../dll/directx/wine/d3dx9_36/CMakeLists.txt | 2 +- reactos/dll/directx/wine/ddraw/CMakeLists.txt | 2 +- .../dll/directx/wine/wined3d/CMakeLists.txt | 2 +- reactos/dll/ntdll/CMakeLists.txt | 2 +- reactos/dll/win32/acledit/CMakeLists.txt | 2 +- reactos/dll/win32/aclui/CMakeLists.txt | 2 +- reactos/dll/win32/advapi32/CMakeLists.txt | 2 +- reactos/dll/win32/atl/CMakeLists.txt | 2 +- reactos/dll/win32/authz/CMakeLists.txt | 2 +- reactos/dll/win32/avicap32/CMakeLists.txt | 2 +- reactos/dll/win32/avifil32/CMakeLists.txt | 2 +- reactos/dll/win32/batt/CMakeLists.txt | 2 +- reactos/dll/win32/bcrypt/CMakeLists.txt | 2 +- reactos/dll/win32/beepmidi/CMakeLists.txt | 2 +- reactos/dll/win32/cabinet/CMakeLists.txt | 2 +- reactos/dll/win32/cards/CMakeLists.txt | 2 +- reactos/dll/win32/cfgmgr32/CMakeLists.txt | 2 +- reactos/dll/win32/clusapi/CMakeLists.txt | 2 +- reactos/dll/win32/comctl32/CMakeLists.txt | 2 +- reactos/dll/win32/comdlg32/CMakeLists.txt | 2 +- reactos/dll/win32/compstui/CMakeLists.txt | 2 +- reactos/dll/win32/credui/CMakeLists.txt | 2 +- reactos/dll/win32/crypt32/CMakeLists.txt | 2 +- reactos/dll/win32/cryptdlg/CMakeLists.txt | 2 +- reactos/dll/win32/cryptnet/CMakeLists.txt | 2 +- reactos/dll/win32/cryptui/CMakeLists.txt | 2 +- reactos/dll/win32/dbghelp/CMakeLists.txt | 2 +- reactos/dll/win32/dciman32/CMakeLists.txt | 2 +- reactos/dll/win32/devmgr/CMakeLists.txt | 2 +- reactos/dll/win32/dhcpcsvc/CMakeLists.txt | 2 +- reactos/dll/win32/dnsapi/CMakeLists.txt | 2 +- reactos/dll/win32/dwmapi/CMakeLists.txt | 2 +- reactos/dll/win32/faultrep/CMakeLists.txt | 2 +- reactos/dll/win32/fmifs/CMakeLists.txt | 2 +- reactos/dll/win32/fusion/CMakeLists.txt | 2 +- reactos/dll/win32/gdi32/CMakeLists.txt | 2 +- reactos/dll/win32/gdiplus/CMakeLists.txt | 2 +- reactos/dll/win32/getuname/CMakeLists.txt | 2 +- reactos/dll/win32/glu32/CMakeLists.txt | 2 +- reactos/dll/win32/hlink/CMakeLists.txt | 2 +- reactos/dll/win32/httpapi/CMakeLists.txt | 2 +- reactos/dll/win32/icmp/CMakeLists.txt | 2 +- reactos/dll/win32/imagehlp/CMakeLists.txt | 2 +- reactos/dll/win32/imm32/CMakeLists.txt | 2 +- reactos/dll/win32/inetcomm/CMakeLists.txt | 2 +- reactos/dll/win32/inetmib1/CMakeLists.txt | 2 +- reactos/dll/win32/initpki/CMakeLists.txt | 2 +- reactos/dll/win32/inseng/CMakeLists.txt | 2 +- reactos/dll/win32/iphlpapi/CMakeLists.txt | 2 +- reactos/dll/win32/itircl/CMakeLists.txt | 2 +- reactos/dll/win32/itss/CMakeLists.txt | 2 +- reactos/dll/win32/kernel32/CMakeLists.txt | 2 +- reactos/dll/win32/loadperf/CMakeLists.txt | 2 +- reactos/dll/win32/localspl/CMakeLists.txt | 2 +- reactos/dll/win32/localui/CMakeLists.txt | 2 +- reactos/dll/win32/lpk/CMakeLists.txt | 2 +- reactos/dll/win32/lsasrv/CMakeLists.txt | 2 +- reactos/dll/win32/lz32/CMakeLists.txt | 2 +- reactos/dll/win32/mapi32/CMakeLists.txt | 2 +- reactos/dll/win32/mlang/CMakeLists.txt | 2 +- reactos/dll/win32/modemui/CMakeLists.txt | 2 +- reactos/dll/win32/mpr/CMakeLists.txt | 2 +- reactos/dll/win32/mprapi/CMakeLists.txt | 2 +- reactos/dll/win32/msacm32/CMakeLists.txt | 2 +- reactos/dll/win32/mscms/CMakeLists.txt | 2 +- reactos/dll/win32/mscoree/CMakeLists.txt | 2 +- reactos/dll/win32/msctf/CMakeLists.txt | 2 +- reactos/dll/win32/msftedit/CMakeLists.txt | 2 +- reactos/dll/win32/msgina/CMakeLists.txt | 2 +- reactos/dll/win32/mshtml/CMakeLists.txt | 2 +- reactos/dll/win32/msi/CMakeLists.txt | 2 +- reactos/dll/win32/msimg32/CMakeLists.txt | 2 +- reactos/dll/win32/msimtf/CMakeLists.txt | 2 +- reactos/dll/win32/msisip/CMakeLists.txt | 2 +- reactos/dll/win32/msports/CMakeLists.txt | 2 +- reactos/dll/win32/mssign32/CMakeLists.txt | 2 +- reactos/dll/win32/mssip32/CMakeLists.txt | 2 +- reactos/dll/win32/mstask/CMakeLists.txt | 2 +- reactos/dll/win32/msvcrt/CMakeLists.txt | 2 +- reactos/dll/win32/msvfw32/CMakeLists.txt | 2 +- reactos/dll/win32/mswsock/CMakeLists.txt | 2 +- reactos/dll/win32/msxml3/CMakeLists.txt | 2 +- reactos/dll/win32/nddeapi/CMakeLists.txt | 2 +- reactos/dll/win32/netapi32/CMakeLists.txt | 2 +- reactos/dll/win32/netcfgx/CMakeLists.txt | 2 +- reactos/dll/win32/netshell/CMakeLists.txt | 2 +- reactos/dll/win32/newdev/CMakeLists.txt | 2 +- reactos/dll/win32/ntdsapi/CMakeLists.txt | 2 +- reactos/dll/win32/ntlanman/CMakeLists.txt | 2 +- reactos/dll/win32/ntprint/CMakeLists.txt | 2 +- reactos/dll/win32/odbc32/CMakeLists.txt | 2 +- reactos/dll/win32/odbccp32/CMakeLists.txt | 2 +- reactos/dll/win32/ole32/CMakeLists.txt | 2 +- reactos/dll/win32/oleacc/CMakeLists.txt | 2 +- reactos/dll/win32/oleaut32/CMakeLists.txt | 2 +- reactos/dll/win32/olecli32/CMakeLists.txt | 2 +- reactos/dll/win32/oledlg/CMakeLists.txt | 2 +- reactos/dll/win32/olesvr32/CMakeLists.txt | 2 +- reactos/dll/win32/olethk32/CMakeLists.txt | 2 +- reactos/dll/win32/opengl32/CMakeLists.txt | 2 +- reactos/dll/win32/pdh/CMakeLists.txt | 2 +- reactos/dll/win32/pidgen/CMakeLists.txt | 2 +- reactos/dll/win32/powrprof/CMakeLists.txt | 2 +- reactos/dll/win32/printui/CMakeLists.txt | 2 +- reactos/dll/win32/psapi/CMakeLists.txt | 2 +- reactos/dll/win32/pstorec/CMakeLists.txt | 2 +- reactos/dll/win32/query/CMakeLists.txt | 2 +- reactos/dll/win32/rasadhlp/CMakeLists.txt | 2 +- reactos/dll/win32/rasapi32/CMakeLists.txt | 2 +- reactos/dll/win32/rasdlg/CMakeLists.txt | 2 +- reactos/dll/win32/rasman/CMakeLists.txt | 2 +- reactos/dll/win32/resutils/CMakeLists.txt | 2 +- reactos/dll/win32/riched20/CMakeLists.txt | 2 +- reactos/dll/win32/rpcrt4/CMakeLists.txt | 2 +- reactos/dll/win32/rsaenh/CMakeLists.txt | 2 +- reactos/dll/win32/samlib/CMakeLists.txt | 2 +- reactos/dll/win32/sccbase/CMakeLists.txt | 2 +- reactos/dll/win32/schannel/CMakeLists.txt | 2 +- reactos/dll/win32/secur32/CMakeLists.txt | 2 +- reactos/dll/win32/sensapi/CMakeLists.txt | 2 +- reactos/dll/win32/setupapi/CMakeLists.txt | 2 +- reactos/dll/win32/sfc/CMakeLists.txt | 2 +- reactos/dll/win32/sfc_os/CMakeLists.txt | 2 +- reactos/dll/win32/shdocvw/CMakeLists.txt | 2 +- reactos/dll/win32/shell32/CMakeLists.txt | 2 +- reactos/dll/win32/shimgvw/CMakeLists.txt | 2 +- reactos/dll/win32/shlwapi/CMakeLists.txt | 2 +- reactos/dll/win32/slbcsp/CMakeLists.txt | 2 +- reactos/dll/win32/smdll/CMakeLists.txt | 2 +- reactos/dll/win32/snmpapi/CMakeLists.txt | 2 +- reactos/dll/win32/spoolss/CMakeLists.txt | 2 +- reactos/dll/win32/srclient/CMakeLists.txt | 2 +- reactos/dll/win32/sxs/CMakeLists.txt | 2 +- reactos/dll/win32/syssetup/CMakeLists.txt | 2 +- reactos/dll/win32/t2embed/CMakeLists.txt | 2 +- reactos/dll/win32/tapi32/CMakeLists.txt | 2 +- reactos/dll/win32/traffic/CMakeLists.txt | 2 +- reactos/dll/win32/ufatx/CMakeLists.txt | 2 +- reactos/dll/win32/unicows/CMakeLists.txt | 2 +- reactos/dll/win32/updspapi/CMakeLists.txt | 2 +- reactos/dll/win32/url/CMakeLists.txt | 2 +- reactos/dll/win32/urlmon/CMakeLists.txt | 2 +- reactos/dll/win32/user32/CMakeLists.txt | 2 +- reactos/dll/win32/userenv/CMakeLists.txt | 2 +- reactos/dll/win32/usp10/CMakeLists.txt | 2 +- reactos/dll/win32/uxtheme/CMakeLists.txt | 2 +- reactos/dll/win32/version/CMakeLists.txt | 2 +- .../dll/win32/windowscodecs/CMakeLists.txt | 2 +- reactos/dll/win32/winhttp/CMakeLists.txt | 2 +- reactos/dll/win32/wininet/CMakeLists.txt | 2 +- reactos/dll/win32/winmm/CMakeLists.txt | 2 +- reactos/dll/win32/winspool/CMakeLists.txt | 2 +- reactos/dll/win32/wintrust/CMakeLists.txt | 2 +- reactos/dll/win32/wlanapi/CMakeLists.txt | 2 +- reactos/dll/win32/wldap32/CMakeLists.txt | 2 +- reactos/dll/win32/ws2_32/CMakeLists.txt | 2 +- reactos/dll/win32/ws2help/CMakeLists.txt | 2 +- reactos/dll/win32/wtsapi32/CMakeLists.txt | 2 +- reactos/dll/win32/xinput1_3/CMakeLists.txt | 2 +- reactos/dll/win32/xmllite/CMakeLists.txt | 2 +- reactos/drivers/base/bootvid/CMakeLists.txt | 2 +- reactos/drivers/base/kdcom/CMakeLists.txt | 2 +- reactos/drivers/base/kddll/CMakeLists.txt | 2 +- reactos/drivers/battery/battc/CMakeLists.txt | 2 +- reactos/drivers/directx/dxgthk/CMakeLists.txt | 2 +- reactos/drivers/ksfilter/ks/CMakeLists.txt | 2 +- reactos/drivers/network/ndis/CMakeLists.txt | 2 +- .../storage/class/class2/CMakeLists.txt | 2 +- .../storage/ide/pciidex/CMakeLists.txt | 2 +- .../drivers/storage/scsiport/CMakeLists.txt | 2 +- reactos/drivers/usb/usbd/CMakeLists.txt | 2 +- .../drivers/video/font/ftfd/CMakeLists.txt | 2 +- reactos/drivers/video/videoprt/CMakeLists.txt | 2 +- .../drivers/wdm/audio/drm/drmk/CMakeLists.txt | 2 +- reactos/drivers/wmi/CMakeLists.txt | 2 +- reactos/hal/halx86/CMakeLists.txt | 2 +- reactos/ntoskrnl/CMakeLists.txt | 2 +- .../win32/csrss/csrsrv/CMakeLists.txt | 2 +- .../subsystems/win32/win32k/CMakeLists.txt | 2 +- 201 files changed, 238 insertions(+), 278 deletions(-) diff --git a/reactos/base/shell/explorer/CMakeLists.txt b/reactos/base/shell/explorer/CMakeLists.txt index 26ae04dd927..14f73046157 100644 --- a/reactos/base/shell/explorer/CMakeLists.txt +++ b/reactos/base/shell/explorer/CMakeLists.txt @@ -12,6 +12,7 @@ add_definitions( -DWIN32 -D__WINDRES__) +#add_pch(explorer precomp.h) include_directories(${CMAKE_CURRENT_SOURCE_DIR}) list(APPEND SOURCE @@ -65,10 +66,6 @@ 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) diff --git a/reactos/base/shell/explorer/notifyhook/CMakeLists.txt b/reactos/base/shell/explorer/notifyhook/CMakeLists.txt index 952823963e4..b3eda1e7589 100644 --- a/reactos/base/shell/explorer/notifyhook/CMakeLists.txt +++ b/reactos/base/shell/explorer/notifyhook/CMakeLists.txt @@ -1,7 +1,7 @@ add_definitions(-D_NOTIFYHOOK_IMPL) -spec2def(notifyhook.dll notifyhook.spec ADD_IMPORTLIB) +spec2def(notifyhook.dll notifyhook.spec) list(APPEND SOURCE notifyhook.c diff --git a/reactos/cmake/gcc.cmake b/reactos/cmake/gcc.cmake index 7503d7ed5a1..867c52b13d0 100644 --- a/reactos/cmake/gcc.cmake +++ b/reactos/cmake/gcc.cmake @@ -233,24 +233,23 @@ macro(add_importlib_target _exports_file) 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") - if(${_extension} STREQUAL ".def") + 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 @@ -260,44 +259,30 @@ macro(add_importlib_target _exports_file) 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}) - # 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) + 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) + 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 ${__output} - COMMAND native-spec2def ${__args} ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} + 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} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file}) set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_file}.def - 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() - + PROPERTIES GENERATED TRUE EXTERNAL_OBJECT TRUE) + set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c PROPERTIES GENERATED TRUE) endmacro() macro(macro_mc FILE) @@ -331,42 +316,20 @@ 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) -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() + #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}) - 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() + #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}") endmacro() macro(CreateBootSectorTarget _target_name _asm_file _object_file _base_address) diff --git a/reactos/dll/cpl/inetcpl/CMakeLists.txt b/reactos/dll/cpl/inetcpl/CMakeLists.txt index 970ffa2df9b..df363f2f93d 100644 --- a/reactos/dll/cpl/inetcpl/CMakeLists.txt +++ b/reactos/dll/cpl/inetcpl/CMakeLists.txt @@ -4,7 +4,7 @@ set_rc_compiler() include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(inetcpl.cpl inetcpl.spec GENERATE_STUBS) +spec2def(inetcpl.cpl inetcpl.spec) list(APPEND SOURCE inetcpl.c diff --git a/reactos/dll/directx/dinput/CMakeLists.txt b/reactos/dll/directx/dinput/CMakeLists.txt index 88b788a5679..142e22d7b07 100644 --- a/reactos/dll/directx/dinput/CMakeLists.txt +++ b/reactos/dll/directx/dinput/CMakeLists.txt @@ -6,7 +6,7 @@ add_definitions(-D_WIN32_WINNT=0x600) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(dinput.dll dinput.spec ADD_IMPORTLIB) +spec2def(dinput.dll dinput.spec) add_library(dinput SHARED data_formats.c diff --git a/reactos/dll/directx/dinput8/CMakeLists.txt b/reactos/dll/directx/dinput8/CMakeLists.txt index ac54d750c0c..5f2fab45510 100644 --- a/reactos/dll/directx/dinput8/CMakeLists.txt +++ b/reactos/dll/directx/dinput8/CMakeLists.txt @@ -6,7 +6,7 @@ add_definitions(-D_WIN32_WINNT=0x600) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(dinput8.dll dinput8.spec ADD_IMPORTLIB) +spec2def(dinput8.dll dinput8.spec) add_library(dinput8 SHARED dinput8_main.c diff --git a/reactos/dll/directx/dplay/CMakeLists.txt b/reactos/dll/directx/dplay/CMakeLists.txt index 5337d3c19b3..1626bceb34d 100644 --- a/reactos/dll/directx/dplay/CMakeLists.txt +++ b/reactos/dll/directx/dplay/CMakeLists.txt @@ -3,7 +3,7 @@ set_unicode() include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(dplay.dll dplay.spec ADD_IMPORTLIB) +spec2def(dplay.dll dplay.spec) add_library(dplay SHARED dplay_main.c diff --git a/reactos/dll/directx/dplayx/CMakeLists.txt b/reactos/dll/directx/dplayx/CMakeLists.txt index 3a67c8dae6c..77c80743427 100644 --- a/reactos/dll/directx/dplayx/CMakeLists.txt +++ b/reactos/dll/directx/dplayx/CMakeLists.txt @@ -1,7 +1,7 @@ set_rc_compiler() -spec2def(dplayx.dll dplayx.spec ADD_IMPORTLIB) +spec2def(dplayx.dll dplayx.spec) list(APPEND SOURCE dpclassfactory.c diff --git a/reactos/dll/directx/dsound/CMakeLists.txt b/reactos/dll/directx/dsound/CMakeLists.txt index 9607f13a318..84f3782c9ff 100644 --- a/reactos/dll/directx/dsound/CMakeLists.txt +++ b/reactos/dll/directx/dsound/CMakeLists.txt @@ -5,7 +5,7 @@ add_definitions( include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(dsound.dll dsound.spec ADD_IMPORTLIB) +spec2def(dsound.dll dsound.spec) add_library(dsound SHARED buffer.c diff --git a/reactos/dll/directx/ksuser/CMakeLists.txt b/reactos/dll/directx/ksuser/CMakeLists.txt index 17131c9b2e3..5f3acb71205 100644 --- a/reactos/dll/directx/ksuser/CMakeLists.txt +++ b/reactos/dll/directx/ksuser/CMakeLists.txt @@ -1,5 +1,5 @@ -spec2def(ksuser.dll ksuser.spec ADD_IMPORTLIB) +spec2def(ksuser.dll ksuser.spec) add_library(ksuser SHARED ksuser.c ksuser.rc ${CMAKE_CURRENT_BINARY_DIR}/ksuser.def) diff --git a/reactos/dll/directx/wine/d3d9/CMakeLists.txt b/reactos/dll/directx/wine/d3d9/CMakeLists.txt index 441b906fed6..642815dc02b 100644 --- a/reactos/dll/directx/wine/d3d9/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3d9/CMakeLists.txt @@ -9,7 +9,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) set_rc_compiler() -spec2def(d3d9.dll d3d9.spec ADD_IMPORTLIB GENERATE_STUBS) +spec2def(d3d9.dll d3d9.spec) list(APPEND SOURCE buffer.c diff --git a/reactos/dll/directx/wine/d3dx9_24/CMakeLists.txt b/reactos/dll/directx/wine/d3dx9_24/CMakeLists.txt index 08ecf5c0060..39ce0ce0371 100644 --- a/reactos/dll/directx/wine/d3dx9_24/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3dx9_24/CMakeLists.txt @@ -1,6 +1,6 @@ set_rc_compiler() -spec2def(d3dx9_24.dll d3dx9_24.spec ADD_IMPORTLIB GENERATE_STUBS) +spec2def(d3dx9_24.dll d3dx9_24.spec) list(APPEND SOURCE d3dx9_24_main.c diff --git a/reactos/dll/directx/wine/d3dx9_25/CMakeLists.txt b/reactos/dll/directx/wine/d3dx9_25/CMakeLists.txt index 949d33a473c..98c9a7f9e79 100644 --- a/reactos/dll/directx/wine/d3dx9_25/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3dx9_25/CMakeLists.txt @@ -1,6 +1,6 @@ set_rc_compiler() -spec2def(d3dx9_25.dll d3dx9_25.spec ADD_IMPORTLIB GENERATE_STUBS) +spec2def(d3dx9_25.dll d3dx9_25.spec) list(APPEND SOURCE d3dx9_25_main.c diff --git a/reactos/dll/directx/wine/d3dx9_26/CMakeLists.txt b/reactos/dll/directx/wine/d3dx9_26/CMakeLists.txt index 54f66483fd0..82f45db4c0e 100644 --- a/reactos/dll/directx/wine/d3dx9_26/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3dx9_26/CMakeLists.txt @@ -1,6 +1,6 @@ set_rc_compiler() -spec2def(d3dx9_26.dll d3dx9_26.spec GENERATE_STUBS) +spec2def(d3dx9_26.dll d3dx9_26.spec) list(APPEND SOURCE d3dx9_26_main.c diff --git a/reactos/dll/directx/wine/d3dx9_27/CMakeLists.txt b/reactos/dll/directx/wine/d3dx9_27/CMakeLists.txt index ecee55c613f..595fb303814 100644 --- a/reactos/dll/directx/wine/d3dx9_27/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3dx9_27/CMakeLists.txt @@ -1,6 +1,6 @@ set_rc_compiler() -spec2def(d3dx9_27.dll d3dx9_27.spec GENERATE_STUBS) +spec2def(d3dx9_27.dll d3dx9_27.spec) list(APPEND SOURCE d3dx9_27_main.c diff --git a/reactos/dll/directx/wine/d3dx9_28/CMakeLists.txt b/reactos/dll/directx/wine/d3dx9_28/CMakeLists.txt index 12ee2e2f976..1abdaf0b692 100644 --- a/reactos/dll/directx/wine/d3dx9_28/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3dx9_28/CMakeLists.txt @@ -1,6 +1,6 @@ set_rc_compiler() -spec2def(d3dx9_28.dll d3dx9_28.spec GENERATE_STUBS) +spec2def(d3dx9_28.dll d3dx9_28.spec) list(APPEND SOURCE d3dx9_28_main.c diff --git a/reactos/dll/directx/wine/d3dx9_29/CMakeLists.txt b/reactos/dll/directx/wine/d3dx9_29/CMakeLists.txt index 41792739aad..431a7830835 100644 --- a/reactos/dll/directx/wine/d3dx9_29/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3dx9_29/CMakeLists.txt @@ -1,6 +1,6 @@ set_rc_compiler() -spec2def(d3dx9_29.dll d3dx9_29.spec GENERATE_STUBS) +spec2def(d3dx9_29.dll d3dx9_29.spec) list(APPEND SOURCE d3dx9_29_main.c diff --git a/reactos/dll/directx/wine/d3dx9_30/CMakeLists.txt b/reactos/dll/directx/wine/d3dx9_30/CMakeLists.txt index 323070c718a..d6d00c81cf3 100644 --- a/reactos/dll/directx/wine/d3dx9_30/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3dx9_30/CMakeLists.txt @@ -1,6 +1,6 @@ set_rc_compiler() -spec2def(d3dx9_30.dll d3dx9_30.spec GENERATE_STUBS) +spec2def(d3dx9_30.dll d3dx9_30.spec) list(APPEND SOURCE d3dx9_30_main.c diff --git a/reactos/dll/directx/wine/d3dx9_31/CMakeLists.txt b/reactos/dll/directx/wine/d3dx9_31/CMakeLists.txt index 9e1cde457eb..aa45584de71 100644 --- a/reactos/dll/directx/wine/d3dx9_31/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3dx9_31/CMakeLists.txt @@ -1,6 +1,6 @@ set_rc_compiler() -spec2def(d3dx9_31.dll d3dx9_31.spec GENERATE_STUBS) +spec2def(d3dx9_31.dll d3dx9_31.spec) list(APPEND SOURCE d3dx9_31_main.c diff --git a/reactos/dll/directx/wine/d3dx9_32/CMakeLists.txt b/reactos/dll/directx/wine/d3dx9_32/CMakeLists.txt index 37b69a635ea..249e8195303 100644 --- a/reactos/dll/directx/wine/d3dx9_32/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3dx9_32/CMakeLists.txt @@ -1,6 +1,6 @@ set_rc_compiler() -spec2def(d3dx9_32.dll d3dx9_32.spec GENERATE_STUBS) +spec2def(d3dx9_32.dll d3dx9_32.spec) list(APPEND SOURCE d3dx9_32_main.c diff --git a/reactos/dll/directx/wine/d3dx9_33/CMakeLists.txt b/reactos/dll/directx/wine/d3dx9_33/CMakeLists.txt index 4a38e18ea7b..cefe373c27c 100644 --- a/reactos/dll/directx/wine/d3dx9_33/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3dx9_33/CMakeLists.txt @@ -1,6 +1,6 @@ set_rc_compiler() -spec2def(d3dx9_33.dll d3dx9_33.spec GENERATE_STUBS) +spec2def(d3dx9_33.dll d3dx9_33.spec) list(APPEND SOURCE d3dx9_33_main.c diff --git a/reactos/dll/directx/wine/d3dx9_34/CMakeLists.txt b/reactos/dll/directx/wine/d3dx9_34/CMakeLists.txt index a82c5ce4380..7353481b206 100644 --- a/reactos/dll/directx/wine/d3dx9_34/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3dx9_34/CMakeLists.txt @@ -1,6 +1,6 @@ set_rc_compiler() -spec2def(d3dx9_34.dll d3dx9_34.spec GENERATE_STUBS) +spec2def(d3dx9_34.dll d3dx9_34.spec) list(APPEND SOURCE d3dx9_34_main.c diff --git a/reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt b/reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt index 27f6c3e013b..34ca20bf6a6 100644 --- a/reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt @@ -1,6 +1,6 @@ set_rc_compiler() -spec2def(d3dx9_36.dll d3dx9_36.spec ADD_IMPORTLIB GENERATE_STUBS) +spec2def(d3dx9_36.dll d3dx9_36.spec) list(APPEND SOURCE core.c diff --git a/reactos/dll/directx/wine/ddraw/CMakeLists.txt b/reactos/dll/directx/wine/ddraw/CMakeLists.txt index aa39873fbe7..b05d1a50343 100644 --- a/reactos/dll/directx/wine/ddraw/CMakeLists.txt +++ b/reactos/dll/directx/wine/ddraw/CMakeLists.txt @@ -11,7 +11,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) set_rc_compiler() -spec2def(ddraw.dll ddraw.spec ADD_IMPORTLIB GENERATE_STUBS) +spec2def(ddraw.dll ddraw.spec) list(APPEND SOURCE clipper.c diff --git a/reactos/dll/directx/wine/wined3d/CMakeLists.txt b/reactos/dll/directx/wine/wined3d/CMakeLists.txt index 160010a971e..01989775c42 100644 --- a/reactos/dll/directx/wine/wined3d/CMakeLists.txt +++ b/reactos/dll/directx/wine/wined3d/CMakeLists.txt @@ -13,7 +13,7 @@ if(MSVC) add_definitions(-Disinf=!_finite) endif() -spec2def(wined3d.dll wined3d.spec ADD_IMPORTLIB) +spec2def(wined3d.dll wined3d.spec) list(APPEND SOURCE ati_fragment_shader.c diff --git a/reactos/dll/ntdll/CMakeLists.txt b/reactos/dll/ntdll/CMakeLists.txt index 5559daa6fdf..a2b2c9da239 100644 --- a/reactos/dll/ntdll/CMakeLists.txt +++ b/reactos/dll/ntdll/CMakeLists.txt @@ -1,5 +1,5 @@ -spec2def(ntdll.dll def/ntdll.spec ADD_IMPORTLIB) +spec2def(ntdll.dll def/ntdll.spec) add_definitions( -D__NTDLL__ diff --git a/reactos/dll/win32/acledit/CMakeLists.txt b/reactos/dll/win32/acledit/CMakeLists.txt index 73c3b69b810..5a923400e28 100644 --- a/reactos/dll/win32/acledit/CMakeLists.txt +++ b/reactos/dll/win32/acledit/CMakeLists.txt @@ -1,7 +1,7 @@ set_unicode() set_rc_compiler() -spec2def(acledit.dll acledit.spec ADD_IMPORTLIB) +spec2def(acledit.dll acledit.spec) list(APPEND SOURCE acledit.c diff --git a/reactos/dll/win32/aclui/CMakeLists.txt b/reactos/dll/win32/aclui/CMakeLists.txt index b028b060094..41f8009a3bb 100644 --- a/reactos/dll/win32/aclui/CMakeLists.txt +++ b/reactos/dll/win32/aclui/CMakeLists.txt @@ -1,5 +1,5 @@ -spec2def(aclui.dll aclui.spec ADD_IMPORTLIB) +spec2def(aclui.dll aclui.spec) set_rc_compiler() set_unicode() diff --git a/reactos/dll/win32/advapi32/CMakeLists.txt b/reactos/dll/win32/advapi32/CMakeLists.txt index 0ab480574b4..d250c718559 100644 --- a/reactos/dll/win32/advapi32/CMakeLists.txt +++ b/reactos/dll/win32/advapi32/CMakeLists.txt @@ -1,7 +1,7 @@ set_unicode() -spec2def(advapi32.dll advapi32.spec ADD_IMPORTLIB GENERATE_STUBS) +spec2def(advapi32.dll advapi32.spec) add_definitions(-D_ADVAPI32_) diff --git a/reactos/dll/win32/atl/CMakeLists.txt b/reactos/dll/win32/atl/CMakeLists.txt index 83742e2c605..3fc13e9ead8 100644 --- a/reactos/dll/win32/atl/CMakeLists.txt +++ b/reactos/dll/win32/atl/CMakeLists.txt @@ -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 ADD_IMPORTLIB) +spec2def(atl.dll atl.spec) list(APPEND SOURCE atl_ax.c diff --git a/reactos/dll/win32/authz/CMakeLists.txt b/reactos/dll/win32/authz/CMakeLists.txt index 8206a9415d5..3e5f6573b82 100644 --- a/reactos/dll/win32/authz/CMakeLists.txt +++ b/reactos/dll/win32/authz/CMakeLists.txt @@ -1,7 +1,7 @@ set_unicode() -spec2def(authz.dll authz.spec GENERATE_STUBS) +spec2def(authz.dll authz.spec) list(APPEND SOURCE authz.c diff --git a/reactos/dll/win32/avicap32/CMakeLists.txt b/reactos/dll/win32/avicap32/CMakeLists.txt index dd9081b7986..268203e3d54 100644 --- a/reactos/dll/win32/avicap32/CMakeLists.txt +++ b/reactos/dll/win32/avicap32/CMakeLists.txt @@ -1,5 +1,5 @@ -spec2def(avicap32.dll avicap32.spec ADD_IMPORTLIB) +spec2def(avicap32.dll avicap32.spec) set_unicode() diff --git a/reactos/dll/win32/avifil32/CMakeLists.txt b/reactos/dll/win32/avifil32/CMakeLists.txt index e27bcaf9c92..d1041cbc50b 100644 --- a/reactos/dll/win32/avifil32/CMakeLists.txt +++ b/reactos/dll/win32/avifil32/CMakeLists.txt @@ -8,7 +8,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) set_rc_compiler() -spec2def(avifil32.dll avifil32.spec ADD_IMPORTLIB) +spec2def(avifil32.dll avifil32.spec) add_library(avifil32 SHARED acmstream.c diff --git a/reactos/dll/win32/batt/CMakeLists.txt b/reactos/dll/win32/batt/CMakeLists.txt index 1c016a14bf3..d652c00b7ea 100644 --- a/reactos/dll/win32/batt/CMakeLists.txt +++ b/reactos/dll/win32/batt/CMakeLists.txt @@ -1,5 +1,5 @@ -spec2def(batt.dll batt.spec ADD_IMPORTLIB) +spec2def(batt.dll batt.spec) set_unicode() set_rc_compiler() diff --git a/reactos/dll/win32/bcrypt/CMakeLists.txt b/reactos/dll/win32/bcrypt/CMakeLists.txt index 606ef285d10..d618a818321 100644 --- a/reactos/dll/win32/bcrypt/CMakeLists.txt +++ b/reactos/dll/win32/bcrypt/CMakeLists.txt @@ -3,7 +3,7 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) set_rc_compiler() -spec2def(bcrypt.dll bcrypt.spec GENERATE_STUBS) +spec2def(bcrypt.dll bcrypt.spec) list(APPEND SOURCE bcrypt_main.c diff --git a/reactos/dll/win32/beepmidi/CMakeLists.txt b/reactos/dll/win32/beepmidi/CMakeLists.txt index 2d1c0b30a6d..bac931cf584 100644 --- a/reactos/dll/win32/beepmidi/CMakeLists.txt +++ b/reactos/dll/win32/beepmidi/CMakeLists.txt @@ -1,7 +1,7 @@ set_unicode() -spec2def(beepmidi.dll beepmidi.spec ADD_IMPORTLIB) +spec2def(beepmidi.dll beepmidi.spec) list(APPEND SOURCE beepmidi.c diff --git a/reactos/dll/win32/cabinet/CMakeLists.txt b/reactos/dll/win32/cabinet/CMakeLists.txt index b994ccd6088..f85c5e0a4d5 100644 --- a/reactos/dll/win32/cabinet/CMakeLists.txt +++ b/reactos/dll/win32/cabinet/CMakeLists.txt @@ -3,7 +3,7 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(cabinet.dll cabinet.spec ADD_IMPORTLIB) +spec2def(cabinet.dll cabinet.spec) list(APPEND SOURCE cabinet_main.c diff --git a/reactos/dll/win32/cards/CMakeLists.txt b/reactos/dll/win32/cards/CMakeLists.txt index 97521f460f7..1ef048fef2a 100644 --- a/reactos/dll/win32/cards/CMakeLists.txt +++ b/reactos/dll/win32/cards/CMakeLists.txt @@ -6,7 +6,7 @@ add_definitions(-DCARDSTYLE_DEFAULT) set_rc_compiler() -spec2def(cards.dll cards.spec ADD_IMPORTLIB) +spec2def(cards.dll cards.spec) list(APPEND SOURCE cards.c diff --git a/reactos/dll/win32/cfgmgr32/CMakeLists.txt b/reactos/dll/win32/cfgmgr32/CMakeLists.txt index a60c417db72..ad1bdcb7ab1 100644 --- a/reactos/dll/win32/cfgmgr32/CMakeLists.txt +++ b/reactos/dll/win32/cfgmgr32/CMakeLists.txt @@ -1,5 +1,5 @@ -spec2def(cfgmgr32.dll cfgmgr32.spec GENERATE_STUBS) +spec2def(cfgmgr32.dll cfgmgr32.spec) list(APPEND SOURCE cfgmgr32.rc diff --git a/reactos/dll/win32/clusapi/CMakeLists.txt b/reactos/dll/win32/clusapi/CMakeLists.txt index c95a4c1f4b3..c80015b6efb 100644 --- a/reactos/dll/win32/clusapi/CMakeLists.txt +++ b/reactos/dll/win32/clusapi/CMakeLists.txt @@ -4,7 +4,7 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) set_rc_compiler() -spec2def(clusapi.dll clusapi.spec GENERATE_STUBS) +spec2def(clusapi.dll clusapi.spec) list(APPEND SOURCE clusapi.c diff --git a/reactos/dll/win32/comctl32/CMakeLists.txt b/reactos/dll/win32/comctl32/CMakeLists.txt index 0c17d9aa2f1..2bf968616b8 100644 --- a/reactos/dll/win32/comctl32/CMakeLists.txt +++ b/reactos/dll/win32/comctl32/CMakeLists.txt @@ -12,7 +12,7 @@ add_definitions(-D_WIN32_WINNT=0x600) include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(comctl32.dll comctl32.spec ADD_IMPORTLIB) +spec2def(comctl32.dll comctl32.spec) list(APPEND SOURCE animate.c diff --git a/reactos/dll/win32/comdlg32/CMakeLists.txt b/reactos/dll/win32/comdlg32/CMakeLists.txt index 76d102e22a3..90918029bb6 100644 --- a/reactos/dll/win32/comdlg32/CMakeLists.txt +++ b/reactos/dll/win32/comdlg32/CMakeLists.txt @@ -7,7 +7,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) set_rc_compiler() -spec2def(comdlg32.dll comdlg32.spec ADD_IMPORTLIB GENERATE_STUBS) +spec2def(comdlg32.dll comdlg32.spec) list(APPEND SOURCE cdlg32.c diff --git a/reactos/dll/win32/compstui/CMakeLists.txt b/reactos/dll/win32/compstui/CMakeLists.txt index 67a7d913c6f..c4fbafa2238 100644 --- a/reactos/dll/win32/compstui/CMakeLists.txt +++ b/reactos/dll/win32/compstui/CMakeLists.txt @@ -3,7 +3,7 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(compstui.dll compstui.spec ADD_IMPORTLIB) +spec2def(compstui.dll compstui.spec) list(APPEND SOURCE compstui_main.c diff --git a/reactos/dll/win32/credui/CMakeLists.txt b/reactos/dll/win32/credui/CMakeLists.txt index 91b420e9e79..aa4783407c0 100644 --- a/reactos/dll/win32/credui/CMakeLists.txt +++ b/reactos/dll/win32/credui/CMakeLists.txt @@ -5,7 +5,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) set_rc_compiler() -spec2def(credui.dll credui.spec ADD_IMPORTLIB GENERATE_STUBS) +spec2def(credui.dll credui.spec) list(APPEND SOURCE credui_main.c diff --git a/reactos/dll/win32/crypt32/CMakeLists.txt b/reactos/dll/win32/crypt32/CMakeLists.txt index f46dc9a35ed..22e772dd876 100644 --- a/reactos/dll/win32/crypt32/CMakeLists.txt +++ b/reactos/dll/win32/crypt32/CMakeLists.txt @@ -10,7 +10,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) set_rc_compiler() -spec2def(crypt32.dll crypt32.spec ADD_IMPORTLIB GENERATE_STUBS) +spec2def(crypt32.dll crypt32.spec) list(APPEND SOURCE base64.c diff --git a/reactos/dll/win32/cryptdlg/CMakeLists.txt b/reactos/dll/win32/cryptdlg/CMakeLists.txt index 0898714f161..8dc706b3603 100644 --- a/reactos/dll/win32/cryptdlg/CMakeLists.txt +++ b/reactos/dll/win32/cryptdlg/CMakeLists.txt @@ -4,7 +4,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) set_rc_compiler() -spec2def(cryptdlg.dll cryptdlg.spec GENERATE_STUBS) +spec2def(cryptdlg.dll cryptdlg.spec) list(APPEND SOURCE main.c diff --git a/reactos/dll/win32/cryptnet/CMakeLists.txt b/reactos/dll/win32/cryptnet/CMakeLists.txt index 005171d19a3..51200f6a14f 100644 --- a/reactos/dll/win32/cryptnet/CMakeLists.txt +++ b/reactos/dll/win32/cryptnet/CMakeLists.txt @@ -2,7 +2,7 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(cryptnet.dll cryptnet.spec ADD_IMPORTLIB GENERATE_STUBS) +spec2def(cryptnet.dll cryptnet.spec) list(APPEND SOURCE cryptnet_main.c diff --git a/reactos/dll/win32/cryptui/CMakeLists.txt b/reactos/dll/win32/cryptui/CMakeLists.txt index c9367857467..17682b820a3 100644 --- a/reactos/dll/win32/cryptui/CMakeLists.txt +++ b/reactos/dll/win32/cryptui/CMakeLists.txt @@ -7,7 +7,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) set_rc_compiler() -spec2def(cryptui.dll cryptui.spec ADD_IMPORTLIB GENERATE_STUBS) +spec2def(cryptui.dll cryptui.spec) list(APPEND SOURCE main.c diff --git a/reactos/dll/win32/dbghelp/CMakeLists.txt b/reactos/dll/win32/dbghelp/CMakeLists.txt index e3fce2c5532..59eacd22aba 100644 --- a/reactos/dll/win32/dbghelp/CMakeLists.txt +++ b/reactos/dll/win32/dbghelp/CMakeLists.txt @@ -14,7 +14,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) set_rc_compiler() -spec2def(dbghelp.dll dbghelp.spec ADD_IMPORTLIB GENERATE_STUBS) +spec2def(dbghelp.dll dbghelp.spec) list(APPEND SOURCE coff.c diff --git a/reactos/dll/win32/dciman32/CMakeLists.txt b/reactos/dll/win32/dciman32/CMakeLists.txt index 1243aec2c0c..038d75a7356 100644 --- a/reactos/dll/win32/dciman32/CMakeLists.txt +++ b/reactos/dll/win32/dciman32/CMakeLists.txt @@ -5,7 +5,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) set_rc_compiler() -spec2def(dciman32.dll dciman32.spec GENERATE_STUBS) +spec2def(dciman32.dll dciman32.spec) list(APPEND SOURCE dciman_main.c diff --git a/reactos/dll/win32/devmgr/CMakeLists.txt b/reactos/dll/win32/devmgr/CMakeLists.txt index a39077cc8d2..07959c66ad5 100644 --- a/reactos/dll/win32/devmgr/CMakeLists.txt +++ b/reactos/dll/win32/devmgr/CMakeLists.txt @@ -2,7 +2,7 @@ set_unicode() set_rc_compiler() -spec2def(devmgr.dll devmgr.spec ADD_IMPORTLIB GENERATE_STUBS) +spec2def(devmgr.dll devmgr.spec) list(APPEND SOURCE devmgr.rc diff --git a/reactos/dll/win32/dhcpcsvc/CMakeLists.txt b/reactos/dll/win32/dhcpcsvc/CMakeLists.txt index 43a4557c34d..f82c89cdfc8 100644 --- a/reactos/dll/win32/dhcpcsvc/CMakeLists.txt +++ b/reactos/dll/win32/dhcpcsvc/CMakeLists.txt @@ -3,7 +3,7 @@ add_definitions(-Dtzset=_tzset) include_directories(include) -spec2def(dhcpcsvc.dll dhcpcsvc.spec ADD_IMPORTLIB GENERATE_STUBS) +spec2def(dhcpcsvc.dll dhcpcsvc.spec) list(APPEND SOURCE dhcp/adapter.c diff --git a/reactos/dll/win32/dnsapi/CMakeLists.txt b/reactos/dll/win32/dnsapi/CMakeLists.txt index 7beb3b2dcc9..da10aab172c 100644 --- a/reactos/dll/win32/dnsapi/CMakeLists.txt +++ b/reactos/dll/win32/dnsapi/CMakeLists.txt @@ -6,7 +6,7 @@ include_directories( add_definitions(-DADNS_JGAA_WIN32) -spec2def(dnsapi.dll dnsapi.spec ADD_IMPORTLIB) +spec2def(dnsapi.dll dnsapi.spec) list(APPEND SOURCE dnsapi/adns.c diff --git a/reactos/dll/win32/dwmapi/CMakeLists.txt b/reactos/dll/win32/dwmapi/CMakeLists.txt index de27012fddd..5f775cf2f77 100644 --- a/reactos/dll/win32/dwmapi/CMakeLists.txt +++ b/reactos/dll/win32/dwmapi/CMakeLists.txt @@ -5,7 +5,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) set_rc_compiler() -spec2def(dwmapi.dll dwmapi.spec GENERATE_STUBS) +spec2def(dwmapi.dll dwmapi.spec) list(APPEND SOURCE dwmapi_main.c diff --git a/reactos/dll/win32/faultrep/CMakeLists.txt b/reactos/dll/win32/faultrep/CMakeLists.txt index 76085d9ca0f..38147a4ce28 100644 --- a/reactos/dll/win32/faultrep/CMakeLists.txt +++ b/reactos/dll/win32/faultrep/CMakeLists.txt @@ -5,7 +5,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) set_rc_compiler() -spec2def(faultrep.dll faultrep.spec GENERATE_STUBS) +spec2def(faultrep.dll faultrep.spec) list(APPEND SOURCE faultrep.c diff --git a/reactos/dll/win32/fmifs/CMakeLists.txt b/reactos/dll/win32/fmifs/CMakeLists.txt index 8280e5150d3..8773f74176b 100644 --- a/reactos/dll/win32/fmifs/CMakeLists.txt +++ b/reactos/dll/win32/fmifs/CMakeLists.txt @@ -1,5 +1,5 @@ -spec2def(fmifs.dll fmifs.spec ADD_IMPORTLIB GENERATE_STUBS) +spec2def(fmifs.dll fmifs.spec) list(APPEND SOURCE chkdsk.c diff --git a/reactos/dll/win32/fusion/CMakeLists.txt b/reactos/dll/win32/fusion/CMakeLists.txt index 8fa2bb2f54b..fc43e3f7bb2 100644 --- a/reactos/dll/win32/fusion/CMakeLists.txt +++ b/reactos/dll/win32/fusion/CMakeLists.txt @@ -5,7 +5,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) set_rc_compiler() -spec2def(fusion.dll fusion.spec GENERATE_STUBS) +spec2def(fusion.dll fusion.spec) list(APPEND SOURCE asmcache.c diff --git a/reactos/dll/win32/gdi32/CMakeLists.txt b/reactos/dll/win32/gdi32/CMakeLists.txt index 247857004c6..a3aaeb13479 100644 --- a/reactos/dll/win32/gdi32/CMakeLists.txt +++ b/reactos/dll/win32/gdi32/CMakeLists.txt @@ -5,7 +5,7 @@ add_definitions(-DLANGPACK) include_directories(include) -spec2def(gdi32.dll gdi32.spec ADD_IMPORTLIB) +spec2def(gdi32.dll gdi32.spec) if(ARCH MATCHES i386) list(APPEND SOURCE diff --git a/reactos/dll/win32/gdiplus/CMakeLists.txt b/reactos/dll/win32/gdiplus/CMakeLists.txt index 9f7c243f54c..cf2e3742b0e 100644 --- a/reactos/dll/win32/gdiplus/CMakeLists.txt +++ b/reactos/dll/win32/gdiplus/CMakeLists.txt @@ -7,7 +7,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) set_rc_compiler() -spec2def(gdiplus.dll gdiplus.spec ADD_IMPORTLIB GENERATE_STUBS) +spec2def(gdiplus.dll gdiplus.spec) list(APPEND SOURCE brush.c diff --git a/reactos/dll/win32/getuname/CMakeLists.txt b/reactos/dll/win32/getuname/CMakeLists.txt index 662cc4bb5e5..c0b1308b3e2 100644 --- a/reactos/dll/win32/getuname/CMakeLists.txt +++ b/reactos/dll/win32/getuname/CMakeLists.txt @@ -3,7 +3,7 @@ set_unicode() include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(getuname.dll getuname.spec ADD_IMPORTLIB) +spec2def(getuname.dll getuname.spec) add_library(getuname SHARED getuname.c diff --git a/reactos/dll/win32/glu32/CMakeLists.txt b/reactos/dll/win32/glu32/CMakeLists.txt index de38fb04db9..24f98502940 100644 --- a/reactos/dll/win32/glu32/CMakeLists.txt +++ b/reactos/dll/win32/glu32/CMakeLists.txt @@ -12,7 +12,7 @@ include_directories( libtess libutil) -spec2def(glu32.dll glu32.spec ADD_IMPORTLIB) +spec2def(glu32.dll glu32.spec) list(APPEND SOURCE libnurbs/interface/bezierEval.cc diff --git a/reactos/dll/win32/hlink/CMakeLists.txt b/reactos/dll/win32/hlink/CMakeLists.txt index b8143ffd32d..4229f6dccb6 100644 --- a/reactos/dll/win32/hlink/CMakeLists.txt +++ b/reactos/dll/win32/hlink/CMakeLists.txt @@ -2,7 +2,7 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(hlink.dll hlink.spec ADD_IMPORTLIB GENERATE_STUBS) +spec2def(hlink.dll hlink.spec) list(APPEND SOURCE browse_ctx.c diff --git a/reactos/dll/win32/httpapi/CMakeLists.txt b/reactos/dll/win32/httpapi/CMakeLists.txt index 9a16ff7ac9e..70e942e8ca9 100644 --- a/reactos/dll/win32/httpapi/CMakeLists.txt +++ b/reactos/dll/win32/httpapi/CMakeLists.txt @@ -3,7 +3,7 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(httpapi.dll httpapi.spec GENERATE_STUBS) +spec2def(httpapi.dll httpapi.spec) list(APPEND SOURCE httpapi_main.c diff --git a/reactos/dll/win32/icmp/CMakeLists.txt b/reactos/dll/win32/icmp/CMakeLists.txt index ac09f59e9b0..da27f38a60c 100644 --- a/reactos/dll/win32/icmp/CMakeLists.txt +++ b/reactos/dll/win32/icmp/CMakeLists.txt @@ -3,7 +3,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) set_rc_compiler() -spec2def(icmp.dll icmp.spec ADD_IMPORTLIB GENERATE_STUBS) +spec2def(icmp.dll icmp.spec) list(APPEND SOURCE icmp_main.c diff --git a/reactos/dll/win32/imagehlp/CMakeLists.txt b/reactos/dll/win32/imagehlp/CMakeLists.txt index f835dc99fee..573098c670e 100644 --- a/reactos/dll/win32/imagehlp/CMakeLists.txt +++ b/reactos/dll/win32/imagehlp/CMakeLists.txt @@ -2,7 +2,7 @@ add_definitions(-D_IMAGEHLP_SOURCE_) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(imagehlp.dll imagehlp.spec ADD_IMPORTLIB GENERATE_STUBS) +spec2def(imagehlp.dll imagehlp.spec) list(APPEND SOURCE access.c diff --git a/reactos/dll/win32/imm32/CMakeLists.txt b/reactos/dll/win32/imm32/CMakeLists.txt index c3dc1cb91eb..dfdd313b82f 100644 --- a/reactos/dll/win32/imm32/CMakeLists.txt +++ b/reactos/dll/win32/imm32/CMakeLists.txt @@ -12,7 +12,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) set_rc_compiler() -spec2def(imm32.dll imm32.spec ADD_IMPORTLIB GENERATE_STUBS) +spec2def(imm32.dll imm32.spec) list(APPEND SOURCE imm.c diff --git a/reactos/dll/win32/inetcomm/CMakeLists.txt b/reactos/dll/win32/inetcomm/CMakeLists.txt index 10d357e5794..0e0a1c7d589 100644 --- a/reactos/dll/win32/inetcomm/CMakeLists.txt +++ b/reactos/dll/win32/inetcomm/CMakeLists.txt @@ -6,7 +6,7 @@ add_definitions(-D_WIN32_WINNT=0x600) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(inetcomm.dll inetcomm.spec ADD_IMPORTLIB GENERATE_STUBS) +spec2def(inetcomm.dll inetcomm.spec) list(APPEND SOURCE imaptransport.c diff --git a/reactos/dll/win32/inetmib1/CMakeLists.txt b/reactos/dll/win32/inetmib1/CMakeLists.txt index 9628b093bf9..84b92fc5424 100644 --- a/reactos/dll/win32/inetmib1/CMakeLists.txt +++ b/reactos/dll/win32/inetmib1/CMakeLists.txt @@ -2,7 +2,7 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(inetmib1.dll inetmib1.spec GENERATE_STUBS) +spec2def(inetmib1.dll inetmib1.spec) list(APPEND SOURCE main.c diff --git a/reactos/dll/win32/initpki/CMakeLists.txt b/reactos/dll/win32/initpki/CMakeLists.txt index ea912e979a3..6133df72d0c 100644 --- a/reactos/dll/win32/initpki/CMakeLists.txt +++ b/reactos/dll/win32/initpki/CMakeLists.txt @@ -3,7 +3,7 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(initpki.dll initpki.spec GENERATE_STUBS) +spec2def(initpki.dll initpki.spec) list(APPEND SOURCE main.c diff --git a/reactos/dll/win32/inseng/CMakeLists.txt b/reactos/dll/win32/inseng/CMakeLists.txt index 3b93c366f11..69a69917248 100644 --- a/reactos/dll/win32/inseng/CMakeLists.txt +++ b/reactos/dll/win32/inseng/CMakeLists.txt @@ -6,7 +6,7 @@ add_definitions(-D_WIN32_WINNT=0x600) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(inseng.dll inseng.spec GENERATE_STUBS) +spec2def(inseng.dll inseng.spec) list(APPEND SOURCE inseng_main.c diff --git a/reactos/dll/win32/iphlpapi/CMakeLists.txt b/reactos/dll/win32/iphlpapi/CMakeLists.txt index 6b3938355a6..c8ae984d34a 100644 --- a/reactos/dll/win32/iphlpapi/CMakeLists.txt +++ b/reactos/dll/win32/iphlpapi/CMakeLists.txt @@ -6,7 +6,7 @@ include_directories( ${REACTOS_SOURCE_DIR}/dll/win32/dhcpcsvc/include ${REACTOS_SOURCE_DIR}/lib/tdilib) -spec2def(iphlpapi.dll iphlpapi.spec ADD_IMPORTLIB GENERATE_STUBS) +spec2def(iphlpapi.dll iphlpapi.spec) list(APPEND SOURCE dhcp_reactos.c diff --git a/reactos/dll/win32/itircl/CMakeLists.txt b/reactos/dll/win32/itircl/CMakeLists.txt index dcd135d54b9..57cc803e403 100644 --- a/reactos/dll/win32/itircl/CMakeLists.txt +++ b/reactos/dll/win32/itircl/CMakeLists.txt @@ -2,7 +2,7 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(itircl.dll itircl.spec GENERATE_STUBS) +spec2def(itircl.dll itircl.spec) list(APPEND SOURCE itircl_main.c diff --git a/reactos/dll/win32/itss/CMakeLists.txt b/reactos/dll/win32/itss/CMakeLists.txt index e6bd785341a..188c2c37784 100644 --- a/reactos/dll/win32/itss/CMakeLists.txt +++ b/reactos/dll/win32/itss/CMakeLists.txt @@ -4,7 +4,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) set_rc_compiler() -spec2def(itss.dll itss.spec GENERATE_STUBS) +spec2def(itss.dll itss.spec) list(APPEND SOURCE chm_lib.c diff --git a/reactos/dll/win32/kernel32/CMakeLists.txt b/reactos/dll/win32/kernel32/CMakeLists.txt index 8840058a2ad..d60988f39c4 100644 --- a/reactos/dll/win32/kernel32/CMakeLists.txt +++ b/reactos/dll/win32/kernel32/CMakeLists.txt @@ -8,7 +8,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys) set_rc_compiler() -spec2def(kernel32.dll kernel32.spec ADD_IMPORTLIB) +spec2def(kernel32.dll kernel32.spec) list(APPEND SOURCE debug/debugger.c diff --git a/reactos/dll/win32/loadperf/CMakeLists.txt b/reactos/dll/win32/loadperf/CMakeLists.txt index 7e54e511749..2e5d86ba3d0 100644 --- a/reactos/dll/win32/loadperf/CMakeLists.txt +++ b/reactos/dll/win32/loadperf/CMakeLists.txt @@ -2,7 +2,7 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(loadperf.dll loadperf.spec ADD_IMPORTLIB) +spec2def(loadperf.dll loadperf.spec) add_library(loadperf SHARED loadperf_main.c diff --git a/reactos/dll/win32/localspl/CMakeLists.txt b/reactos/dll/win32/localspl/CMakeLists.txt index 958d956d59d..5ce1b18826f 100644 --- a/reactos/dll/win32/localspl/CMakeLists.txt +++ b/reactos/dll/win32/localspl/CMakeLists.txt @@ -8,7 +8,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) set_rc_compiler() -spec2def(localspl.dll localspl.spec GENERATE_STUBS) +spec2def(localspl.dll localspl.spec) list(APPEND SOURCE localmon.c diff --git a/reactos/dll/win32/localui/CMakeLists.txt b/reactos/dll/win32/localui/CMakeLists.txt index bbe574032ee..7221755ddfd 100644 --- a/reactos/dll/win32/localui/CMakeLists.txt +++ b/reactos/dll/win32/localui/CMakeLists.txt @@ -4,7 +4,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) set_rc_compiler() -spec2def(localui.dll localui.spec ADD_IMPORTLIB) +spec2def(localui.dll localui.spec) list(APPEND SOURCE localui.c diff --git a/reactos/dll/win32/lpk/CMakeLists.txt b/reactos/dll/win32/lpk/CMakeLists.txt index efb8caa83b8..3e5d6275d11 100644 --- a/reactos/dll/win32/lpk/CMakeLists.txt +++ b/reactos/dll/win32/lpk/CMakeLists.txt @@ -4,7 +4,7 @@ set_unicode() add_definitions(-DLANGPACK) include_directories(include) -spec2def(lpk.dll lpk.spec ADD_IMPORTLIB) +spec2def(lpk.dll lpk.spec) list(APPEND SOURCE dllmain.c diff --git a/reactos/dll/win32/lsasrv/CMakeLists.txt b/reactos/dll/win32/lsasrv/CMakeLists.txt index eb0a2287e07..a25157761a8 100644 --- a/reactos/dll/win32/lsasrv/CMakeLists.txt +++ b/reactos/dll/win32/lsasrv/CMakeLists.txt @@ -7,7 +7,7 @@ include_directories( set_rc_compiler() -spec2def(lsasrv.dll lsasrv.spec ADD_IMPORTLIB GENERATE_STUBS) +spec2def(lsasrv.dll lsasrv.spec) list(APPEND SOURCE authport.c diff --git a/reactos/dll/win32/lz32/CMakeLists.txt b/reactos/dll/win32/lz32/CMakeLists.txt index 9e54f8b8e05..a120899e5d2 100644 --- a/reactos/dll/win32/lz32/CMakeLists.txt +++ b/reactos/dll/win32/lz32/CMakeLists.txt @@ -2,7 +2,7 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(lz32.dll lz32.spec ADD_IMPORTLIB) +spec2def(lz32.dll lz32.spec) list(APPEND SOURCE version.rc diff --git a/reactos/dll/win32/mapi32/CMakeLists.txt b/reactos/dll/win32/mapi32/CMakeLists.txt index 9e0fa1b3cf5..5c1484e7485 100644 --- a/reactos/dll/win32/mapi32/CMakeLists.txt +++ b/reactos/dll/win32/mapi32/CMakeLists.txt @@ -4,7 +4,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) set_rc_compiler() -spec2def(mapi32.dll mapi32.spec GENERATE_STUBS) +spec2def(mapi32.dll mapi32.spec) list(APPEND SOURCE imalloc.c diff --git a/reactos/dll/win32/mlang/CMakeLists.txt b/reactos/dll/win32/mlang/CMakeLists.txt index a28f824f945..d30cbcc24de 100644 --- a/reactos/dll/win32/mlang/CMakeLists.txt +++ b/reactos/dll/win32/mlang/CMakeLists.txt @@ -6,7 +6,7 @@ add_definitions(-D_WIN32_WINNT=0x600) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(mlang.dll mlang.spec ADD_IMPORTLIB GENERATE_STUBS) +spec2def(mlang.dll mlang.spec) list(APPEND SOURCE mlang.c diff --git a/reactos/dll/win32/modemui/CMakeLists.txt b/reactos/dll/win32/modemui/CMakeLists.txt index 695e3a2a55c..d4d7aac0b0a 100644 --- a/reactos/dll/win32/modemui/CMakeLists.txt +++ b/reactos/dll/win32/modemui/CMakeLists.txt @@ -2,7 +2,7 @@ set_unicode() set_rc_compiler() -spec2def(modemui.dll modemui.spec GENERATE_STUBS) +spec2def(modemui.dll modemui.spec) list(APPEND SOURCE modemui.c diff --git a/reactos/dll/win32/mpr/CMakeLists.txt b/reactos/dll/win32/mpr/CMakeLists.txt index 3e37c31a9dd..65789654de2 100644 --- a/reactos/dll/win32/mpr/CMakeLists.txt +++ b/reactos/dll/win32/mpr/CMakeLists.txt @@ -7,7 +7,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) set_rc_compiler() -spec2def(mpr.dll mpr.spec ADD_IMPORTLIB GENERATE_STUBS) +spec2def(mpr.dll mpr.spec) list(APPEND SOURCE auth.c diff --git a/reactos/dll/win32/mprapi/CMakeLists.txt b/reactos/dll/win32/mprapi/CMakeLists.txt index 5c23902ed42..95c08f67074 100644 --- a/reactos/dll/win32/mprapi/CMakeLists.txt +++ b/reactos/dll/win32/mprapi/CMakeLists.txt @@ -2,7 +2,7 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(mprapi.dll mprapi.spec GENERATE_STUBS) +spec2def(mprapi.dll mprapi.spec) list(APPEND SOURCE mprapi.c diff --git a/reactos/dll/win32/msacm32/CMakeLists.txt b/reactos/dll/win32/msacm32/CMakeLists.txt index 6d9af70c5c6..8eb85ac3eb1 100644 --- a/reactos/dll/win32/msacm32/CMakeLists.txt +++ b/reactos/dll/win32/msacm32/CMakeLists.txt @@ -5,7 +5,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) set_rc_compiler() -spec2def(msacm32.dll msacm32.spec ADD_IMPORTLIB GENERATE_STUBS) +spec2def(msacm32.dll msacm32.spec) list(APPEND SOURCE driver.c diff --git a/reactos/dll/win32/mscms/CMakeLists.txt b/reactos/dll/win32/mscms/CMakeLists.txt index c990c7e9144..8b3f6d9e74c 100644 --- a/reactos/dll/win32/mscms/CMakeLists.txt +++ b/reactos/dll/win32/mscms/CMakeLists.txt @@ -4,7 +4,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) set_rc_compiler() -spec2def(mscms.dll mscms.spec GENERATE_STUBS) +spec2def(mscms.dll mscms.spec) list(APPEND SOURCE handle.c diff --git a/reactos/dll/win32/mscoree/CMakeLists.txt b/reactos/dll/win32/mscoree/CMakeLists.txt index 5b47c89d8c8..75d41f63ddb 100644 --- a/reactos/dll/win32/mscoree/CMakeLists.txt +++ b/reactos/dll/win32/mscoree/CMakeLists.txt @@ -2,7 +2,7 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(mscoree.dll mscoree.spec GENERATE_STUBS) +spec2def(mscoree.dll mscoree.spec) list(APPEND SOURCE corruntimehost.c diff --git a/reactos/dll/win32/msctf/CMakeLists.txt b/reactos/dll/win32/msctf/CMakeLists.txt index 69d3089eaef..b4ec9dfdc3b 100644 --- a/reactos/dll/win32/msctf/CMakeLists.txt +++ b/reactos/dll/win32/msctf/CMakeLists.txt @@ -8,7 +8,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) set_rc_compiler() -spec2def(msctf.dll msctf.spec GENERATE_STUBS) +spec2def(msctf.dll msctf.spec) list(APPEND SOURCE categorymgr.c diff --git a/reactos/dll/win32/msftedit/CMakeLists.txt b/reactos/dll/win32/msftedit/CMakeLists.txt index eb7676ec73e..89b40b56f31 100644 --- a/reactos/dll/win32/msftedit/CMakeLists.txt +++ b/reactos/dll/win32/msftedit/CMakeLists.txt @@ -4,7 +4,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) set_rc_compiler() -spec2def(msftedit.dll msftedit.spec GENERATE_STUBS) +spec2def(msftedit.dll msftedit.spec) list(APPEND SOURCE msftedit_main.c diff --git a/reactos/dll/win32/msgina/CMakeLists.txt b/reactos/dll/win32/msgina/CMakeLists.txt index cf3262e6d4f..61071b9a646 100644 --- a/reactos/dll/win32/msgina/CMakeLists.txt +++ b/reactos/dll/win32/msgina/CMakeLists.txt @@ -5,7 +5,7 @@ include_directories( set_rc_compiler() -spec2def(msgina.dll msgina.spec GENERATE_STUBS) +spec2def(msgina.dll msgina.spec) list(APPEND SOURCE gui.c diff --git a/reactos/dll/win32/mshtml/CMakeLists.txt b/reactos/dll/win32/mshtml/CMakeLists.txt index 2d3aa5877d2..d91ec8a769f 100644 --- a/reactos/dll/win32/mshtml/CMakeLists.txt +++ b/reactos/dll/win32/mshtml/CMakeLists.txt @@ -9,7 +9,7 @@ add_idl_Headers(mshtml_nsiface_header nsiface.idl) set_rc_compiler() -spec2def(mshtml.dll mshtml.spec GENERATE_STUBS) +spec2def(mshtml.dll mshtml.spec) list(APPEND SOURCE conpoint.c diff --git a/reactos/dll/win32/msi/CMakeLists.txt b/reactos/dll/win32/msi/CMakeLists.txt index 7b89c27ff2f..607b8e8c7c7 100644 --- a/reactos/dll/win32/msi/CMakeLists.txt +++ b/reactos/dll/win32/msi/CMakeLists.txt @@ -6,7 +6,7 @@ remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) set_rc_compiler() -spec2def(msi.dll msi.spec ADD_IMPORTLIB GENERATE_STUBS) +spec2def(msi.dll msi.spec) generate_idl_iids(msiserver.idl) diff --git a/reactos/dll/win32/msimg32/CMakeLists.txt b/reactos/dll/win32/msimg32/CMakeLists.txt index f35017feb33..f571b8b0114 100644 --- a/reactos/dll/win32/msimg32/CMakeLists.txt +++ b/reactos/dll/win32/msimg32/CMakeLists.txt @@ -2,7 +2,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) -spec2def(msimg32.dll msimg32.spec ADD_IMPORTLIB) +spec2def(msimg32.dll msimg32.spec) list(APPEND SOURCE msimg32_main.c diff --git a/reactos/dll/win32/msimtf/CMakeLists.txt b/reactos/dll/win32/msimtf/CMakeLists.txt index c7b0947d873..3832d3f787b 100644 --- a/reactos/dll/win32/msimtf/CMakeLists.txt +++ b/reactos/dll/win32/msimtf/CMakeLists.txt @@ -4,7 +4,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) set_rc_compiler() -spec2def(msimtf.dll msimtf.spec GENERATE_STUBS) +spec2def(msimtf.dll msimtf.spec) list(APPEND SOURCE activeimmapp.c diff --git a/reactos/dll/win32/msisip/CMakeLists.txt b/reactos/dll/win32/msisip/CMakeLists.txt index 546cfec078a..c212187aaf3 100644 --- a/reactos/dll/win32/msisip/CMakeLists.txt +++ b/reactos/dll/win32/msisip/CMakeLists.txt @@ -2,7 +2,7 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(msisip.dll msisip.spec GENERATE_STUBS) +spec2def(msisip.dll msisip.spec) list(APPEND SOURCE main.c diff --git a/reactos/dll/win32/msports/CMakeLists.txt b/reactos/dll/win32/msports/CMakeLists.txt index bf1e8fdffbe..e95a1eea379 100644 --- a/reactos/dll/win32/msports/CMakeLists.txt +++ b/reactos/dll/win32/msports/CMakeLists.txt @@ -1,7 +1,7 @@ set_unicode() -spec2def(msports.dll msports.spec ADD_IMPORTLIB GENERATE_STUBS) +spec2def(msports.dll msports.spec) list(APPEND SOURCE classinst.c diff --git a/reactos/dll/win32/mssign32/CMakeLists.txt b/reactos/dll/win32/mssign32/CMakeLists.txt index 97a25eff22c..8b2312221f5 100644 --- a/reactos/dll/win32/mssign32/CMakeLists.txt +++ b/reactos/dll/win32/mssign32/CMakeLists.txt @@ -2,7 +2,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) -spec2def(mssign32.dll mssign32.spec GENERATE_STUBS) +spec2def(mssign32.dll mssign32.spec) list(APPEND SOURCE mssign32_main.c diff --git a/reactos/dll/win32/mssip32/CMakeLists.txt b/reactos/dll/win32/mssip32/CMakeLists.txt index e60584e4a32..0e3d3eebedf 100644 --- a/reactos/dll/win32/mssip32/CMakeLists.txt +++ b/reactos/dll/win32/mssip32/CMakeLists.txt @@ -2,7 +2,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) -spec2def(mssip32.dll mssip32.spec GENERATE_STUBS) +spec2def(mssip32.dll mssip32.spec) list(APPEND SOURCE main.c diff --git a/reactos/dll/win32/mstask/CMakeLists.txt b/reactos/dll/win32/mstask/CMakeLists.txt index 0c3023e9448..cf5b7571024 100644 --- a/reactos/dll/win32/mstask/CMakeLists.txt +++ b/reactos/dll/win32/mstask/CMakeLists.txt @@ -13,7 +13,7 @@ set_rc_compiler() generate_idl_iids(mstask_local.idl) -spec2def(mstask.dll mstask.spec GENERATE_STUBS) +spec2def(mstask.dll mstask.spec) list(APPEND SOURCE factory.c diff --git a/reactos/dll/win32/msvcrt/CMakeLists.txt b/reactos/dll/win32/msvcrt/CMakeLists.txt index fbf8736808b..6e614730c78 100644 --- a/reactos/dll/win32/msvcrt/CMakeLists.txt +++ b/reactos/dll/win32/msvcrt/CMakeLists.txt @@ -1,5 +1,5 @@ -spec2def(msvcrt.dll msvcrt.spec ADD_IMPORTLIB) +spec2def(msvcrt.dll msvcrt.spec) add_definitions( -DUSE_MSVCRT_PREFIX diff --git a/reactos/dll/win32/msvfw32/CMakeLists.txt b/reactos/dll/win32/msvfw32/CMakeLists.txt index 72d79ed9662..57367f75378 100644 --- a/reactos/dll/win32/msvfw32/CMakeLists.txt +++ b/reactos/dll/win32/msvfw32/CMakeLists.txt @@ -5,7 +5,7 @@ add_definitions(-D__WINESRC__) add_definitions(-D_WINE) set_rc_compiler() -spec2def(msvfw32.dll msvfw32.spec ADD_IMPORTLIB GENERATE_STUBS) +spec2def(msvfw32.dll msvfw32.spec) list(APPEND SOURCE mciwnd.c diff --git a/reactos/dll/win32/mswsock/CMakeLists.txt b/reactos/dll/win32/mswsock/CMakeLists.txt index 0690a7dd602..8d501879f33 100644 --- a/reactos/dll/win32/mswsock/CMakeLists.txt +++ b/reactos/dll/win32/mswsock/CMakeLists.txt @@ -4,7 +4,7 @@ set_unicode() add_definitions(-DLE) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(mswsock.dll mswsock.spec ADD_IMPORTLIB) +spec2def(mswsock.dll mswsock.spec) list(APPEND SOURCE extensions.c diff --git a/reactos/dll/win32/msxml3/CMakeLists.txt b/reactos/dll/win32/msxml3/CMakeLists.txt index 0c49fbf87fb..bfa9239cd82 100644 --- a/reactos/dll/win32/msxml3/CMakeLists.txt +++ b/reactos/dll/win32/msxml3/CMakeLists.txt @@ -18,7 +18,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) set_rc_compiler() -spec2def(msxml3.dll msxml3.spec GENERATE_STUBS) +spec2def(msxml3.dll msxml3.spec) list(APPEND SOURCE attribute.c diff --git a/reactos/dll/win32/nddeapi/CMakeLists.txt b/reactos/dll/win32/nddeapi/CMakeLists.txt index fca598bee1c..a085f6bf6d0 100644 --- a/reactos/dll/win32/nddeapi/CMakeLists.txt +++ b/reactos/dll/win32/nddeapi/CMakeLists.txt @@ -2,7 +2,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) -spec2def(nddeapi.dll nddeapi.spec GENERATE_STUBS) +spec2def(nddeapi.dll nddeapi.spec) list(APPEND SOURCE nddeapi.c diff --git a/reactos/dll/win32/netapi32/CMakeLists.txt b/reactos/dll/win32/netapi32/CMakeLists.txt index ccd7d7a913e..988a6461ed1 100644 --- a/reactos/dll/win32/netapi32/CMakeLists.txt +++ b/reactos/dll/win32/netapi32/CMakeLists.txt @@ -2,7 +2,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) -spec2def(netapi32.dll netapi32.spec ADD_IMPORTLIB GENERATE_STUBS) +spec2def(netapi32.dll netapi32.spec) list(APPEND SOURCE access.c diff --git a/reactos/dll/win32/netcfgx/CMakeLists.txt b/reactos/dll/win32/netcfgx/CMakeLists.txt index 1ded6d9edac..fb2e955a563 100644 --- a/reactos/dll/win32/netcfgx/CMakeLists.txt +++ b/reactos/dll/win32/netcfgx/CMakeLists.txt @@ -2,7 +2,7 @@ remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) set_rc_compiler() -spec2def(netcfgx.dll netcfgx.spec GENERATE_STUBS) +spec2def(netcfgx.dll netcfgx.spec) list(APPEND SOURCE netcfgx.c diff --git a/reactos/dll/win32/netshell/CMakeLists.txt b/reactos/dll/win32/netshell/CMakeLists.txt index 78d0655dfeb..9dc74cc503f 100644 --- a/reactos/dll/win32/netshell/CMakeLists.txt +++ b/reactos/dll/win32/netshell/CMakeLists.txt @@ -3,7 +3,7 @@ remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) set_rc_compiler() -spec2def(netshell.dll netshell.spec GENERATE_STUBS) +spec2def(netshell.dll netshell.spec) list(APPEND SOURCE netshell.c diff --git a/reactos/dll/win32/newdev/CMakeLists.txt b/reactos/dll/win32/newdev/CMakeLists.txt index faca4245d0a..d8c112f149d 100644 --- a/reactos/dll/win32/newdev/CMakeLists.txt +++ b/reactos/dll/win32/newdev/CMakeLists.txt @@ -1,7 +1,7 @@ set_unicode() -spec2def(newdev.dll newdev.spec ADD_IMPORTLIB GENERATE_STUBS) +spec2def(newdev.dll newdev.spec) list(APPEND SOURCE newdev.c diff --git a/reactos/dll/win32/ntdsapi/CMakeLists.txt b/reactos/dll/win32/ntdsapi/CMakeLists.txt index abaa18eeca5..60f13dbc4d2 100644 --- a/reactos/dll/win32/ntdsapi/CMakeLists.txt +++ b/reactos/dll/win32/ntdsapi/CMakeLists.txt @@ -2,7 +2,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) -spec2def(ntdsapi.dll ntdsapi.spec ADD_IMPORTLIB GENERATE_STUBS) +spec2def(ntdsapi.dll ntdsapi.spec) list(APPEND SOURCE ntdsapi.c diff --git a/reactos/dll/win32/ntlanman/CMakeLists.txt b/reactos/dll/win32/ntlanman/CMakeLists.txt index 1fc46c6d23d..a97c616cb7a 100644 --- a/reactos/dll/win32/ntlanman/CMakeLists.txt +++ b/reactos/dll/win32/ntlanman/CMakeLists.txt @@ -1,7 +1,7 @@ set_unicode() -spec2def(ntlanman.dll ntlanman.spec GENERATE_STUBS) +spec2def(ntlanman.dll ntlanman.spec) list(APPEND SOURCE ntlanman.c diff --git a/reactos/dll/win32/ntprint/CMakeLists.txt b/reactos/dll/win32/ntprint/CMakeLists.txt index 1c1ea786480..ff7d1681211 100644 --- a/reactos/dll/win32/ntprint/CMakeLists.txt +++ b/reactos/dll/win32/ntprint/CMakeLists.txt @@ -2,7 +2,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) set_rc_compiler() -spec2def(ntprint.dll ntprint.spec GENERATE_STUBS) +spec2def(ntprint.dll ntprint.spec) list(APPEND SOURCE ntprint.c diff --git a/reactos/dll/win32/odbc32/CMakeLists.txt b/reactos/dll/win32/odbc32/CMakeLists.txt index 6063f8ec56c..da84e343c27 100644 --- a/reactos/dll/win32/odbc32/CMakeLists.txt +++ b/reactos/dll/win32/odbc32/CMakeLists.txt @@ -3,7 +3,7 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(odbc32.dll odbc32.spec GENERATE_STUBS) +spec2def(odbc32.dll odbc32.spec) list(APPEND SOURCE proxyodbc.c diff --git a/reactos/dll/win32/odbccp32/CMakeLists.txt b/reactos/dll/win32/odbccp32/CMakeLists.txt index 80a0173eae1..16e60613f59 100644 --- a/reactos/dll/win32/odbccp32/CMakeLists.txt +++ b/reactos/dll/win32/odbccp32/CMakeLists.txt @@ -2,7 +2,7 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(odbccp32.dll odbccp32.spec ADD_IMPORTLIB GENERATE_STUBS) +spec2def(odbccp32.dll odbccp32.spec) list(APPEND SOURCE odbccp32.c diff --git a/reactos/dll/win32/ole32/CMakeLists.txt b/reactos/dll/win32/ole32/CMakeLists.txt index 70034683913..bb8ccfd6b56 100644 --- a/reactos/dll/win32/ole32/CMakeLists.txt +++ b/reactos/dll/win32/ole32/CMakeLists.txt @@ -1,7 +1,7 @@ set_rc_compiler() -spec2def(ole32.dll ole32.spec ADD_IMPORTLIB GENERATE_STUBS) +spec2def(ole32.dll ole32.spec) generate_idl_iids(dcom.idl) add_idl_headers(ole32idl dcom.idl irot.idl) diff --git a/reactos/dll/win32/oleacc/CMakeLists.txt b/reactos/dll/win32/oleacc/CMakeLists.txt index 2dbdddaa1c4..e9948efb432 100644 --- a/reactos/dll/win32/oleacc/CMakeLists.txt +++ b/reactos/dll/win32/oleacc/CMakeLists.txt @@ -3,7 +3,7 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) set_rc_compiler() -spec2def(oleacc.dll oleacc.spec ADD_IMPORTLIB GENERATE_STUBS) +spec2def(oleacc.dll oleacc.spec) list(APPEND SOURCE main.c diff --git a/reactos/dll/win32/oleaut32/CMakeLists.txt b/reactos/dll/win32/oleaut32/CMakeLists.txt index 51f29136df9..bc1c63005ef 100644 --- a/reactos/dll/win32/oleaut32/CMakeLists.txt +++ b/reactos/dll/win32/oleaut32/CMakeLists.txt @@ -16,7 +16,7 @@ include_directories( ${REACTOS_SOURCE_DIR}/include/reactos/libs/libjpeg ${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(oleaut32.dll oleaut32.spec ADD_IMPORTLIB GENERATE_STUBS) +spec2def(oleaut32.dll oleaut32.spec) add_rpcproxy_files(oleaut32_oaidl.idl oleaut32_ocidl.idl) diff --git a/reactos/dll/win32/olecli32/CMakeLists.txt b/reactos/dll/win32/olecli32/CMakeLists.txt index 6a0eec35ae7..fa9032389e3 100644 --- a/reactos/dll/win32/olecli32/CMakeLists.txt +++ b/reactos/dll/win32/olecli32/CMakeLists.txt @@ -3,7 +3,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) set_rc_compiler() -spec2def(olecli32.dll olecli32.spec GENERATE_STUBS) +spec2def(olecli32.dll olecli32.spec) list(APPEND SOURCE olecli_main.c diff --git a/reactos/dll/win32/oledlg/CMakeLists.txt b/reactos/dll/win32/oledlg/CMakeLists.txt index cebbf9e2524..e4d838accc1 100644 --- a/reactos/dll/win32/oledlg/CMakeLists.txt +++ b/reactos/dll/win32/oledlg/CMakeLists.txt @@ -2,7 +2,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) -spec2def(oledlg.dll oledlg.spec ADD_IMPORTLIB) +spec2def(oledlg.dll oledlg.spec) list(APPEND SOURCE insobjdlg.c diff --git a/reactos/dll/win32/olesvr32/CMakeLists.txt b/reactos/dll/win32/olesvr32/CMakeLists.txt index cb3c4034126..dbfc68a3ef4 100644 --- a/reactos/dll/win32/olesvr32/CMakeLists.txt +++ b/reactos/dll/win32/olesvr32/CMakeLists.txt @@ -2,7 +2,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) -spec2def(olesvr32.dll olesvr32.spec GENERATE_STUBS) +spec2def(olesvr32.dll olesvr32.spec) list(APPEND SOURCE olesvr_main.c diff --git a/reactos/dll/win32/olethk32/CMakeLists.txt b/reactos/dll/win32/olethk32/CMakeLists.txt index 95116841230..1fa6589c538 100644 --- a/reactos/dll/win32/olethk32/CMakeLists.txt +++ b/reactos/dll/win32/olethk32/CMakeLists.txt @@ -3,7 +3,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) set_rc_compiler() -spec2def(olethk32.dll olethk32.spec GENERATE_STUBS) +spec2def(olethk32.dll olethk32.spec) list(APPEND SOURCE main.c diff --git a/reactos/dll/win32/opengl32/CMakeLists.txt b/reactos/dll/win32/opengl32/CMakeLists.txt index c0bda337927..bdf1e4f1ec2 100644 --- a/reactos/dll/win32/opengl32/CMakeLists.txt +++ b/reactos/dll/win32/opengl32/CMakeLists.txt @@ -1,7 +1,7 @@ set_unicode() -spec2def(opengl32.dll opengl32.spec ADD_IMPORTLIB GENERATE_STUBS) +spec2def(opengl32.dll opengl32.spec) list(APPEND SOURCE font.c diff --git a/reactos/dll/win32/pdh/CMakeLists.txt b/reactos/dll/win32/pdh/CMakeLists.txt index f5395699d0c..6a814245ccb 100644 --- a/reactos/dll/win32/pdh/CMakeLists.txt +++ b/reactos/dll/win32/pdh/CMakeLists.txt @@ -6,7 +6,7 @@ add_definitions(-D_WIN32_WINNT=0x600) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(pdh.dll pdh.spec ADD_IMPORTLIB GENERATE_STUBS) +spec2def(pdh.dll pdh.spec) list(APPEND SOURCE pdh_main.c diff --git a/reactos/dll/win32/pidgen/CMakeLists.txt b/reactos/dll/win32/pidgen/CMakeLists.txt index fdd510b1d62..e175a586c1a 100644 --- a/reactos/dll/win32/pidgen/CMakeLists.txt +++ b/reactos/dll/win32/pidgen/CMakeLists.txt @@ -3,7 +3,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) set_rc_compiler() -spec2def(pidgen.dll pidgen.spec GENERATE_STUBS) +spec2def(pidgen.dll pidgen.spec) list(APPEND SOURCE main.c diff --git a/reactos/dll/win32/powrprof/CMakeLists.txt b/reactos/dll/win32/powrprof/CMakeLists.txt index c28ade2795b..183a0cba732 100644 --- a/reactos/dll/win32/powrprof/CMakeLists.txt +++ b/reactos/dll/win32/powrprof/CMakeLists.txt @@ -1,5 +1,5 @@ -spec2def(powrprof.dll powrprof.spec ADD_IMPORTLIB) +spec2def(powrprof.dll powrprof.spec) set_unicode() diff --git a/reactos/dll/win32/printui/CMakeLists.txt b/reactos/dll/win32/printui/CMakeLists.txt index af8552db0e8..72777f17c6d 100644 --- a/reactos/dll/win32/printui/CMakeLists.txt +++ b/reactos/dll/win32/printui/CMakeLists.txt @@ -3,7 +3,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) set_rc_compiler() -spec2def(printui.dll printui.spec GENERATE_STUBS) +spec2def(printui.dll printui.spec) list(APPEND SOURCE printui.c diff --git a/reactos/dll/win32/psapi/CMakeLists.txt b/reactos/dll/win32/psapi/CMakeLists.txt index 11d69e4a64b..dda730acbd0 100644 --- a/reactos/dll/win32/psapi/CMakeLists.txt +++ b/reactos/dll/win32/psapi/CMakeLists.txt @@ -1,5 +1,5 @@ -spec2def(psapi.dll psapi.spec ADD_IMPORTLIB) +spec2def(psapi.dll psapi.spec) list(APPEND SOURCE malloc.c diff --git a/reactos/dll/win32/pstorec/CMakeLists.txt b/reactos/dll/win32/pstorec/CMakeLists.txt index bc1dbadae9b..dc5aa64ce06 100644 --- a/reactos/dll/win32/pstorec/CMakeLists.txt +++ b/reactos/dll/win32/pstorec/CMakeLists.txt @@ -5,7 +5,7 @@ add_dependencies(pstorec_tlb stdole2) add_definitions(-D__WINESRC__) set_rc_compiler() -spec2def(pstorec.dll pstorec.spec GENERATE_STUBS) +spec2def(pstorec.dll pstorec.spec) list(APPEND SOURCE pstorec.c diff --git a/reactos/dll/win32/query/CMakeLists.txt b/reactos/dll/win32/query/CMakeLists.txt index 91a0939f5e7..3574784cccc 100644 --- a/reactos/dll/win32/query/CMakeLists.txt +++ b/reactos/dll/win32/query/CMakeLists.txt @@ -2,7 +2,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) -spec2def(query.dll query.spec GENERATE_STUBS) +spec2def(query.dll query.spec) list(APPEND SOURCE query_main.c diff --git a/reactos/dll/win32/rasadhlp/CMakeLists.txt b/reactos/dll/win32/rasadhlp/CMakeLists.txt index caf5cd6d79b..05b95a07f0a 100644 --- a/reactos/dll/win32/rasadhlp/CMakeLists.txt +++ b/reactos/dll/win32/rasadhlp/CMakeLists.txt @@ -1,7 +1,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/winsock) -spec2def(rasadhlp.dll rasadhlp.spec GENERATE_STUBS) +spec2def(rasadhlp.dll rasadhlp.spec) list(APPEND SOURCE autodial.c diff --git a/reactos/dll/win32/rasapi32/CMakeLists.txt b/reactos/dll/win32/rasapi32/CMakeLists.txt index 933129cbae5..f3d3728b568 100644 --- a/reactos/dll/win32/rasapi32/CMakeLists.txt +++ b/reactos/dll/win32/rasapi32/CMakeLists.txt @@ -3,7 +3,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) set_rc_compiler() -spec2def(rasapi32.dll rasapi32.spec ADD_IMPORTLIB GENERATE_STUBS) +spec2def(rasapi32.dll rasapi32.spec) list(APPEND SOURCE rasapi.c diff --git a/reactos/dll/win32/rasdlg/CMakeLists.txt b/reactos/dll/win32/rasdlg/CMakeLists.txt index 4c9a714567c..0079620d800 100644 --- a/reactos/dll/win32/rasdlg/CMakeLists.txt +++ b/reactos/dll/win32/rasdlg/CMakeLists.txt @@ -1,6 +1,6 @@ set_rc_compiler() -spec2def(rasdlg.dll rasdlg.spec GENERATE_STUBS) +spec2def(rasdlg.dll rasdlg.spec) list(APPEND SOURCE rasdlg.c diff --git a/reactos/dll/win32/rasman/CMakeLists.txt b/reactos/dll/win32/rasman/CMakeLists.txt index 4de4a91a6db..626f7563172 100644 --- a/reactos/dll/win32/rasman/CMakeLists.txt +++ b/reactos/dll/win32/rasman/CMakeLists.txt @@ -1,5 +1,5 @@ set_rc_compiler() -spec2def(rasman.dll rasman.spec GENERATE_STUBS) +spec2def(rasman.dll rasman.spec) list(APPEND SOURCE rasman.c diff --git a/reactos/dll/win32/resutils/CMakeLists.txt b/reactos/dll/win32/resutils/CMakeLists.txt index 4acad3cc134..4592d25cbae 100644 --- a/reactos/dll/win32/resutils/CMakeLists.txt +++ b/reactos/dll/win32/resutils/CMakeLists.txt @@ -2,7 +2,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) -spec2def(resutils.dll resutils.spec GENERATE_STUBS) +spec2def(resutils.dll resutils.spec) list(APPEND SOURCE resutils.c diff --git a/reactos/dll/win32/riched20/CMakeLists.txt b/reactos/dll/win32/riched20/CMakeLists.txt index fe1c628f1bd..cf636b6f0c7 100644 --- a/reactos/dll/win32/riched20/CMakeLists.txt +++ b/reactos/dll/win32/riched20/CMakeLists.txt @@ -2,7 +2,7 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(riched20.dll riched20.spec ADD_IMPORTLIB) +spec2def(riched20.dll riched20.spec) set_rc_compiler() diff --git a/reactos/dll/win32/rpcrt4/CMakeLists.txt b/reactos/dll/win32/rpcrt4/CMakeLists.txt index 9872f9f2ec0..c2d585f166a 100644 --- a/reactos/dll/win32/rpcrt4/CMakeLists.txt +++ b/reactos/dll/win32/rpcrt4/CMakeLists.txt @@ -35,7 +35,7 @@ add_definitions( -DCOM_NO_WINDOWS_H -DMSWMSG) -spec2def(rpcrt4.dll rpcrt4.spec ADD_IMPORTLIB GENERATE_STUBS) +spec2def(rpcrt4.dll rpcrt4.spec) add_library(rpcrt4 SHARED ${SOURCE}) diff --git a/reactos/dll/win32/rsaenh/CMakeLists.txt b/reactos/dll/win32/rsaenh/CMakeLists.txt index 87d29a4c702..49434499d74 100644 --- a/reactos/dll/win32/rsaenh/CMakeLists.txt +++ b/reactos/dll/win32/rsaenh/CMakeLists.txt @@ -2,7 +2,7 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(rsaenh.dll rsaenh.spec ADD_IMPORTLIB) +spec2def(rsaenh.dll rsaenh.spec) list(APPEND SOURCE aes.c diff --git a/reactos/dll/win32/samlib/CMakeLists.txt b/reactos/dll/win32/samlib/CMakeLists.txt index d67891ec51b..5b2754ad93e 100644 --- a/reactos/dll/win32/samlib/CMakeLists.txt +++ b/reactos/dll/win32/samlib/CMakeLists.txt @@ -3,7 +3,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) set_rc_compiler() -spec2def(samlib.dll samlib.spec ADD_IMPORTLIB GENERATE_STUBS) +spec2def(samlib.dll samlib.spec) list(APPEND SOURCE dllmain.c diff --git a/reactos/dll/win32/sccbase/CMakeLists.txt b/reactos/dll/win32/sccbase/CMakeLists.txt index b4ac6e4064b..45f0a059c8b 100644 --- a/reactos/dll/win32/sccbase/CMakeLists.txt +++ b/reactos/dll/win32/sccbase/CMakeLists.txt @@ -2,7 +2,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) -spec2def(sccbase.dll sccbase.spec GENERATE_STUBS) +spec2def(sccbase.dll sccbase.spec) list(APPEND SOURCE main.c diff --git a/reactos/dll/win32/schannel/CMakeLists.txt b/reactos/dll/win32/schannel/CMakeLists.txt index eec68597f75..de83c952b78 100644 --- a/reactos/dll/win32/schannel/CMakeLists.txt +++ b/reactos/dll/win32/schannel/CMakeLists.txt @@ -2,7 +2,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) set_rc_compiler() -spec2def(schannel.dll schannel.spec GENERATE_STUBS) +spec2def(schannel.dll schannel.spec) list(APPEND SOURCE lsamode.c diff --git a/reactos/dll/win32/secur32/CMakeLists.txt b/reactos/dll/win32/secur32/CMakeLists.txt index 151d157fb06..a460f046863 100644 --- a/reactos/dll/win32/secur32/CMakeLists.txt +++ b/reactos/dll/win32/secur32/CMakeLists.txt @@ -2,7 +2,7 @@ add_definitions(-D__SECUR32__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys) -spec2def(secur32.dll secur32.spec ADD_IMPORTLIB GENERATE_STUBS) +spec2def(secur32.dll secur32.spec) list(APPEND SOURCE dllmain.c diff --git a/reactos/dll/win32/sensapi/CMakeLists.txt b/reactos/dll/win32/sensapi/CMakeLists.txt index 151b6f97f64..9612da919a8 100644 --- a/reactos/dll/win32/sensapi/CMakeLists.txt +++ b/reactos/dll/win32/sensapi/CMakeLists.txt @@ -2,7 +2,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) -spec2def(sensapi.dll sensapi.spec ADD_IMPORTLIB) +spec2def(sensapi.dll sensapi.spec) list(APPEND SOURCE sensapi.c diff --git a/reactos/dll/win32/setupapi/CMakeLists.txt b/reactos/dll/win32/setupapi/CMakeLists.txt index 5abd8c82ec9..4cd101c30ec 100644 --- a/reactos/dll/win32/setupapi/CMakeLists.txt +++ b/reactos/dll/win32/setupapi/CMakeLists.txt @@ -12,7 +12,7 @@ include_directories( set_rc_compiler() -spec2def(setupapi.dll setupapi.spec ADD_IMPORTLIB GENERATE_STUBS) +spec2def(setupapi.dll setupapi.spec) list(APPEND SOURCE cfgmgr.c diff --git a/reactos/dll/win32/sfc/CMakeLists.txt b/reactos/dll/win32/sfc/CMakeLists.txt index cc17d19ce5a..9be0fb71fbc 100644 --- a/reactos/dll/win32/sfc/CMakeLists.txt +++ b/reactos/dll/win32/sfc/CMakeLists.txt @@ -1,5 +1,5 @@ -spec2def(sfc.dll sfc.spec GENERATE_STUBS) +spec2def(sfc.dll sfc.spec) list(APPEND SOURCE sfc.c diff --git a/reactos/dll/win32/sfc_os/CMakeLists.txt b/reactos/dll/win32/sfc_os/CMakeLists.txt index 98aaff6a816..0ffd0e7d5ca 100644 --- a/reactos/dll/win32/sfc_os/CMakeLists.txt +++ b/reactos/dll/win32/sfc_os/CMakeLists.txt @@ -1,5 +1,5 @@ -spec2def(sfc_os.dll sfc_os.spec ADD_IMPORTLIB GENERATE_STUBS) +spec2def(sfc_os.dll sfc_os.spec) list(APPEND SOURCE sfc_os.c diff --git a/reactos/dll/win32/shdocvw/CMakeLists.txt b/reactos/dll/win32/shdocvw/CMakeLists.txt index 65a1e6a2e97..db2f0c48a1f 100644 --- a/reactos/dll/win32/shdocvw/CMakeLists.txt +++ b/reactos/dll/win32/shdocvw/CMakeLists.txt @@ -7,7 +7,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) set_rc_compiler() -spec2def(shdocvw.dll shdocvw.spec ADD_IMPORTLIB GENERATE_STUBS) +spec2def(shdocvw.dll shdocvw.spec) list(APPEND SOURCE classinfo.c diff --git a/reactos/dll/win32/shell32/CMakeLists.txt b/reactos/dll/win32/shell32/CMakeLists.txt index ec1974da36c..3180e9f745c 100644 --- a/reactos/dll/win32/shell32/CMakeLists.txt +++ b/reactos/dll/win32/shell32/CMakeLists.txt @@ -12,7 +12,7 @@ include_directories( ${REACTOS_SOURCE_DIR}/lib/recyclebin ${REACTOS_SOURCE_DIR}) -spec2def(shell32.dll shell32.spec ADD_IMPORTLIB GENERATE_STUBS) +spec2def(shell32.dll shell32.spec) list(APPEND SOURCE authors.c diff --git a/reactos/dll/win32/shimgvw/CMakeLists.txt b/reactos/dll/win32/shimgvw/CMakeLists.txt index 97dfc2b32b7..1514361c732 100644 --- a/reactos/dll/win32/shimgvw/CMakeLists.txt +++ b/reactos/dll/win32/shimgvw/CMakeLists.txt @@ -1,6 +1,6 @@ set_rc_compiler() -spec2def(shimgvw.dll shimgvw.spec GENERATE_STUBS) +spec2def(shimgvw.dll shimgvw.spec) list(APPEND SOURCE shimgvw.c diff --git a/reactos/dll/win32/shlwapi/CMakeLists.txt b/reactos/dll/win32/shlwapi/CMakeLists.txt index 1f6bd88f6dc..f4d8ab7023b 100644 --- a/reactos/dll/win32/shlwapi/CMakeLists.txt +++ b/reactos/dll/win32/shlwapi/CMakeLists.txt @@ -5,7 +5,7 @@ add_definitions(-D__WINESRC__) remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) -spec2def(shlwapi.dll shlwapi.spec ADD_IMPORTLIB GENERATE_STUBS) +spec2def(shlwapi.dll shlwapi.spec) list(APPEND SOURCE assoc.c diff --git a/reactos/dll/win32/slbcsp/CMakeLists.txt b/reactos/dll/win32/slbcsp/CMakeLists.txt index cd8bcfd0020..50fb9d944d9 100644 --- a/reactos/dll/win32/slbcsp/CMakeLists.txt +++ b/reactos/dll/win32/slbcsp/CMakeLists.txt @@ -2,7 +2,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) -spec2def(slbcsp.dll slbcsp.spec GENERATE_STUBS) +spec2def(slbcsp.dll slbcsp.spec) list(APPEND SOURCE main.c diff --git a/reactos/dll/win32/smdll/CMakeLists.txt b/reactos/dll/win32/smdll/CMakeLists.txt index 563d7539ecc..ba212af1866 100644 --- a/reactos/dll/win32/smdll/CMakeLists.txt +++ b/reactos/dll/win32/smdll/CMakeLists.txt @@ -1,7 +1,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys) -spec2def(smdll.dll smdll.spec ADD_IMPORTLIB) +spec2def(smdll.dll smdll.spec) list(APPEND SOURCE dllmain.c diff --git a/reactos/dll/win32/snmpapi/CMakeLists.txt b/reactos/dll/win32/snmpapi/CMakeLists.txt index 45f3b7a520f..325d372ccf1 100644 --- a/reactos/dll/win32/snmpapi/CMakeLists.txt +++ b/reactos/dll/win32/snmpapi/CMakeLists.txt @@ -6,7 +6,7 @@ remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) set_rc_compiler() -spec2def(snmpapi.dll snmpapi.spec ADD_IMPORTLIB GENERATE_STUBS) +spec2def(snmpapi.dll snmpapi.spec) list(APPEND SOURCE main.c diff --git a/reactos/dll/win32/spoolss/CMakeLists.txt b/reactos/dll/win32/spoolss/CMakeLists.txt index 127140e959f..771a63e5f36 100644 --- a/reactos/dll/win32/spoolss/CMakeLists.txt +++ b/reactos/dll/win32/spoolss/CMakeLists.txt @@ -2,7 +2,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) -spec2def(spoolss.dll spoolss.spec ADD_IMPORTLIB GENERATE_STUBS) +spec2def(spoolss.dll spoolss.spec) list(APPEND SOURCE spoolss_main.c diff --git a/reactos/dll/win32/srclient/CMakeLists.txt b/reactos/dll/win32/srclient/CMakeLists.txt index 8dc5d450212..e6088bb1453 100644 --- a/reactos/dll/win32/srclient/CMakeLists.txt +++ b/reactos/dll/win32/srclient/CMakeLists.txt @@ -1,5 +1,5 @@ -spec2def(srclient.dll srclient.spec GENERATE_STUBS) +spec2def(srclient.dll srclient.spec) list(APPEND SOURCE srclient_main.c diff --git a/reactos/dll/win32/sxs/CMakeLists.txt b/reactos/dll/win32/sxs/CMakeLists.txt index fad069ee1c4..74e5742fe6e 100644 --- a/reactos/dll/win32/sxs/CMakeLists.txt +++ b/reactos/dll/win32/sxs/CMakeLists.txt @@ -2,7 +2,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) -spec2def(sxs.dll sxs.spec GENERATE_STUBS) +spec2def(sxs.dll sxs.spec) list(APPEND SOURCE sxs.c diff --git a/reactos/dll/win32/syssetup/CMakeLists.txt b/reactos/dll/win32/syssetup/CMakeLists.txt index 96504e9bedd..433fb648119 100644 --- a/reactos/dll/win32/syssetup/CMakeLists.txt +++ b/reactos/dll/win32/syssetup/CMakeLists.txt @@ -2,7 +2,7 @@ set_unicode() set_rc_compiler() -spec2def(syssetup.dll syssetup.spec GENERATE_STUBS) +spec2def(syssetup.dll syssetup.spec) list(APPEND SOURCE classinst.c diff --git a/reactos/dll/win32/t2embed/CMakeLists.txt b/reactos/dll/win32/t2embed/CMakeLists.txt index 0aa442132ee..c4b4d67a16f 100644 --- a/reactos/dll/win32/t2embed/CMakeLists.txt +++ b/reactos/dll/win32/t2embed/CMakeLists.txt @@ -3,7 +3,7 @@ set_unicode() include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(t2embed.dll t2embed.spec GENERATE_STUBS) +spec2def(t2embed.dll t2embed.spec) list(APPEND SOURCE t2embed.c diff --git a/reactos/dll/win32/tapi32/CMakeLists.txt b/reactos/dll/win32/tapi32/CMakeLists.txt index d18c2d4d12f..41017c22ee5 100644 --- a/reactos/dll/win32/tapi32/CMakeLists.txt +++ b/reactos/dll/win32/tapi32/CMakeLists.txt @@ -2,7 +2,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) -spec2def(tapi32.dll tapi32.spec GENERATE_STUBS) +spec2def(tapi32.dll tapi32.spec) list(APPEND SOURCE assisted.c diff --git a/reactos/dll/win32/traffic/CMakeLists.txt b/reactos/dll/win32/traffic/CMakeLists.txt index 0f3b16ae026..64764005630 100644 --- a/reactos/dll/win32/traffic/CMakeLists.txt +++ b/reactos/dll/win32/traffic/CMakeLists.txt @@ -2,7 +2,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) -spec2def(traffic.dll traffic.spec GENERATE_STUBS) +spec2def(traffic.dll traffic.spec) list(APPEND SOURCE traffic_main.c diff --git a/reactos/dll/win32/ufatx/CMakeLists.txt b/reactos/dll/win32/ufatx/CMakeLists.txt index aa29ee82d4b..98369440c6e 100644 --- a/reactos/dll/win32/ufatx/CMakeLists.txt +++ b/reactos/dll/win32/ufatx/CMakeLists.txt @@ -1,5 +1,5 @@ -spec2def(ufatx.dll ufatx.spec ADD_IMPORTLIB) +spec2def(ufatx.dll ufatx.spec) list(APPEND SOURCE ufatx.rc diff --git a/reactos/dll/win32/unicows/CMakeLists.txt b/reactos/dll/win32/unicows/CMakeLists.txt index a91bd47c5a9..1abe3c6c9d6 100644 --- a/reactos/dll/win32/unicows/CMakeLists.txt +++ b/reactos/dll/win32/unicows/CMakeLists.txt @@ -1,5 +1,5 @@ -spec2def(unicows.dll unicows.spec GENERATE_STUBS) +spec2def(unicows.dll unicows.spec) list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/unicows_stubs.c diff --git a/reactos/dll/win32/updspapi/CMakeLists.txt b/reactos/dll/win32/updspapi/CMakeLists.txt index 302ac41b04f..456ccde58f2 100644 --- a/reactos/dll/win32/updspapi/CMakeLists.txt +++ b/reactos/dll/win32/updspapi/CMakeLists.txt @@ -2,7 +2,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) -spec2def(updspapi.dll updspapi.spec GENERATE_STUBS) +spec2def(updspapi.dll updspapi.spec) list(APPEND SOURCE main.c diff --git a/reactos/dll/win32/url/CMakeLists.txt b/reactos/dll/win32/url/CMakeLists.txt index 691adc8f02d..ee901a062a3 100644 --- a/reactos/dll/win32/url/CMakeLists.txt +++ b/reactos/dll/win32/url/CMakeLists.txt @@ -2,7 +2,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) -spec2def(url.dll url.spec GENERATE_STUBS) +spec2def(url.dll url.spec) list(APPEND SOURCE url_main.c diff --git a/reactos/dll/win32/urlmon/CMakeLists.txt b/reactos/dll/win32/urlmon/CMakeLists.txt index 6acf2f30f96..99a95265ae4 100644 --- a/reactos/dll/win32/urlmon/CMakeLists.txt +++ b/reactos/dll/win32/urlmon/CMakeLists.txt @@ -8,7 +8,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) set_rc_compiler() -spec2def(urlmon.dll urlmon.spec ADD_IMPORTLIB GENERATE_STUBS) +spec2def(urlmon.dll urlmon.spec) add_rpcproxy_files(urlmon_urlmon.idl) diff --git a/reactos/dll/win32/user32/CMakeLists.txt b/reactos/dll/win32/user32/CMakeLists.txt index 40c260266b2..d40679495f9 100644 --- a/reactos/dll/win32/user32/CMakeLists.txt +++ b/reactos/dll/win32/user32/CMakeLists.txt @@ -1,7 +1,7 @@ set_unicode() -spec2def(user32.dll user32.spec ADD_IMPORTLIB) +spec2def(user32.dll user32.spec) include_directories( BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine diff --git a/reactos/dll/win32/userenv/CMakeLists.txt b/reactos/dll/win32/userenv/CMakeLists.txt index 7461f220d97..f9327fedf99 100644 --- a/reactos/dll/win32/userenv/CMakeLists.txt +++ b/reactos/dll/win32/userenv/CMakeLists.txt @@ -1,5 +1,5 @@ -spec2def(userenv.dll userenv.spec ADD_IMPORTLIB GENERATE_STUBS) +spec2def(userenv.dll userenv.spec) set_rc_compiler() diff --git a/reactos/dll/win32/usp10/CMakeLists.txt b/reactos/dll/win32/usp10/CMakeLists.txt index 2795a47bae3..17b66b15783 100644 --- a/reactos/dll/win32/usp10/CMakeLists.txt +++ b/reactos/dll/win32/usp10/CMakeLists.txt @@ -2,7 +2,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) -spec2def(usp10.dll usp10.spec ADD_IMPORTLIB GENERATE_STUBS) +spec2def(usp10.dll usp10.spec) list(APPEND SOURCE bidi.c diff --git a/reactos/dll/win32/uxtheme/CMakeLists.txt b/reactos/dll/win32/uxtheme/CMakeLists.txt index e7bbb53a9d7..30781aa28a4 100644 --- a/reactos/dll/win32/uxtheme/CMakeLists.txt +++ b/reactos/dll/win32/uxtheme/CMakeLists.txt @@ -3,7 +3,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) set_rc_compiler() -spec2def(uxtheme.dll uxtheme.spec ADD_IMPORTLIB GENERATE_STUBS) +spec2def(uxtheme.dll uxtheme.spec) list(APPEND SOURCE buffer.c diff --git a/reactos/dll/win32/version/CMakeLists.txt b/reactos/dll/win32/version/CMakeLists.txt index 2780e4817dc..beaf8ba13cc 100644 --- a/reactos/dll/win32/version/CMakeLists.txt +++ b/reactos/dll/win32/version/CMakeLists.txt @@ -2,7 +2,7 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(version.dll version.spec ADD_IMPORTLIB) +spec2def(version.dll version.spec) list(APPEND SOURCE info.c diff --git a/reactos/dll/win32/windowscodecs/CMakeLists.txt b/reactos/dll/win32/windowscodecs/CMakeLists.txt index 32218966b93..d99a32ce498 100644 --- a/reactos/dll/win32/windowscodecs/CMakeLists.txt +++ b/reactos/dll/win32/windowscodecs/CMakeLists.txt @@ -16,7 +16,7 @@ if(MSVC) add_compiler_flags(/FItypeof.h) endif() -spec2def(windowscodecs.dll windowscodecs.spec ADD_IMPORTLIB GENERATE_STUBS) +spec2def(windowscodecs.dll windowscodecs.spec) list(APPEND SOURCE bmpdecode.c diff --git a/reactos/dll/win32/winhttp/CMakeLists.txt b/reactos/dll/win32/winhttp/CMakeLists.txt index 76c6d8753ac..a5bff14ed9f 100644 --- a/reactos/dll/win32/winhttp/CMakeLists.txt +++ b/reactos/dll/win32/winhttp/CMakeLists.txt @@ -2,7 +2,7 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(winhttp.dll winhttp.spec ADD_IMPORTLIB) +spec2def(winhttp.dll winhttp.spec) list(APPEND SOURCE cookie.c diff --git a/reactos/dll/win32/wininet/CMakeLists.txt b/reactos/dll/win32/wininet/CMakeLists.txt index 1974906c30f..0351ba69925 100644 --- a/reactos/dll/win32/wininet/CMakeLists.txt +++ b/reactos/dll/win32/wininet/CMakeLists.txt @@ -5,7 +5,7 @@ add_definitions( include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(wininet.dll wininet.spec ADD_IMPORTLIB GENERATE_STUBS) +spec2def(wininet.dll wininet.spec) set_rc_compiler() diff --git a/reactos/dll/win32/winmm/CMakeLists.txt b/reactos/dll/win32/winmm/CMakeLists.txt index bcc5b461c49..0f39831974a 100644 --- a/reactos/dll/win32/winmm/CMakeLists.txt +++ b/reactos/dll/win32/winmm/CMakeLists.txt @@ -2,7 +2,7 @@ add_definitions(-D_WINE) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(winmm.dll winmm.spec ADD_IMPORTLIB GENERATE_STUBS) +spec2def(winmm.dll winmm.spec) set_rc_compiler() diff --git a/reactos/dll/win32/winspool/CMakeLists.txt b/reactos/dll/win32/winspool/CMakeLists.txt index faaea767b82..ad8b6a29808 100644 --- a/reactos/dll/win32/winspool/CMakeLists.txt +++ b/reactos/dll/win32/winspool/CMakeLists.txt @@ -5,7 +5,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) set_rc_compiler() -spec2def(winspool.drv winspool.spec ADD_IMPORTLIB GENERATE_STUBS) +spec2def(winspool.drv winspool.spec) list(APPEND SOURCE info.c diff --git a/reactos/dll/win32/wintrust/CMakeLists.txt b/reactos/dll/win32/wintrust/CMakeLists.txt index 2b189ab4750..f4aebcd2b27 100644 --- a/reactos/dll/win32/wintrust/CMakeLists.txt +++ b/reactos/dll/win32/wintrust/CMakeLists.txt @@ -3,7 +3,7 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) set_rc_compiler() -spec2def(wintrust.dll wintrust.spec ADD_IMPORTLIB GENERATE_STUBS) +spec2def(wintrust.dll wintrust.spec) list(APPEND SOURCE crypt.c diff --git a/reactos/dll/win32/wlanapi/CMakeLists.txt b/reactos/dll/win32/wlanapi/CMakeLists.txt index 4b518706c92..777a117079f 100644 --- a/reactos/dll/win32/wlanapi/CMakeLists.txt +++ b/reactos/dll/win32/wlanapi/CMakeLists.txt @@ -1,7 +1,7 @@ include_directories(${REACTOS_BINARY_DIR}/include/reactos/idl) -spec2def(wlanapi.dll wlanapi.spec ADD_IMPORTLIB GENERATE_STUBS) +spec2def(wlanapi.dll wlanapi.spec) list(APPEND SOURCE main.c diff --git a/reactos/dll/win32/wldap32/CMakeLists.txt b/reactos/dll/win32/wldap32/CMakeLists.txt index c804ff444de..c97f5e443f7 100644 --- a/reactos/dll/win32/wldap32/CMakeLists.txt +++ b/reactos/dll/win32/wldap32/CMakeLists.txt @@ -3,7 +3,7 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) set_rc_compiler() -spec2def(wldap32.dll wldap32.spec ADD_IMPORTLIB GENERATE_STUBS) +spec2def(wldap32.dll wldap32.spec) list(APPEND SOURCE add.c diff --git a/reactos/dll/win32/ws2_32/CMakeLists.txt b/reactos/dll/win32/ws2_32/CMakeLists.txt index efef9737fa6..b2fdb3f6c63 100644 --- a/reactos/dll/win32/ws2_32/CMakeLists.txt +++ b/reactos/dll/win32/ws2_32/CMakeLists.txt @@ -7,7 +7,7 @@ add_definitions(-DWINSOCK_API_LINKAGE=DECLSPEC_EXPORT) include_directories(BEFORE include) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(ws2_32.dll ws2_32.spec ADD_IMPORTLIB) +spec2def(ws2_32.dll ws2_32.spec) list(APPEND SOURCE misc/bsd.c diff --git a/reactos/dll/win32/ws2help/CMakeLists.txt b/reactos/dll/win32/ws2help/CMakeLists.txt index 1bd548944a6..6de001c474c 100644 --- a/reactos/dll/win32/ws2help/CMakeLists.txt +++ b/reactos/dll/win32/ws2help/CMakeLists.txt @@ -1,7 +1,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/winsock) -spec2def(ws2help.dll ws2help.spec ADD_IMPORTLIB) +spec2def(ws2help.dll ws2help.spec) list(APPEND SOURCE apc.c diff --git a/reactos/dll/win32/wtsapi32/CMakeLists.txt b/reactos/dll/win32/wtsapi32/CMakeLists.txt index aabc94decd8..deb123025f1 100644 --- a/reactos/dll/win32/wtsapi32/CMakeLists.txt +++ b/reactos/dll/win32/wtsapi32/CMakeLists.txt @@ -2,7 +2,7 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(wtsapi32.dll wtsapi32.spec GENERATE_STUBS) +spec2def(wtsapi32.dll wtsapi32.spec) list(APPEND SOURCE wtsapi32.c diff --git a/reactos/dll/win32/xinput1_3/CMakeLists.txt b/reactos/dll/win32/xinput1_3/CMakeLists.txt index d40664e9cb5..9d37edd1e66 100644 --- a/reactos/dll/win32/xinput1_3/CMakeLists.txt +++ b/reactos/dll/win32/xinput1_3/CMakeLists.txt @@ -2,7 +2,7 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(xinput1_3.dll xinput1_3.spec ADD_IMPORTLIB) +spec2def(xinput1_3.dll xinput1_3.spec) list(APPEND SOURCE xinput1_3_main.c diff --git a/reactos/dll/win32/xmllite/CMakeLists.txt b/reactos/dll/win32/xmllite/CMakeLists.txt index 1f0ef96f0f5..855cd3a8e82 100644 --- a/reactos/dll/win32/xmllite/CMakeLists.txt +++ b/reactos/dll/win32/xmllite/CMakeLists.txt @@ -2,7 +2,7 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(xmllite.dll xmllite.spec ADD_IMPORTLIB GENERATE_STUBS) +spec2def(xmllite.dll xmllite.spec) list(APPEND SOURCE reader.c diff --git a/reactos/drivers/base/bootvid/CMakeLists.txt b/reactos/drivers/base/bootvid/CMakeLists.txt index 463c40fddfe..ded06a8e48f 100644 --- a/reactos/drivers/base/bootvid/CMakeLists.txt +++ b/reactos/drivers/base/bootvid/CMakeLists.txt @@ -1,5 +1,5 @@ -spec2def(bootvid.dll bootvid.spec ADD_IMPORTLIB) +spec2def(bootvid.dll bootvid.spec) list(APPEND SOURCE bootvid.rc diff --git a/reactos/drivers/base/kdcom/CMakeLists.txt b/reactos/drivers/base/kdcom/CMakeLists.txt index 75f402af88e..8e8a2e17ec8 100644 --- a/reactos/drivers/base/kdcom/CMakeLists.txt +++ b/reactos/drivers/base/kdcom/CMakeLists.txt @@ -1,5 +1,5 @@ -spec2def(kdcom.dll kdcom.spec ADD_IMPORTLIB) +spec2def(kdcom.dll kdcom.spec) if(ARCH MATCHES i386) list(APPEND SOURCE i386/kdbg.c) diff --git a/reactos/drivers/base/kddll/CMakeLists.txt b/reactos/drivers/base/kddll/CMakeLists.txt index 32a9f9cbe11..8083793ca03 100644 --- a/reactos/drivers/base/kddll/CMakeLists.txt +++ b/reactos/drivers/base/kddll/CMakeLists.txt @@ -1,5 +1,5 @@ -spec2def(kdcom.dll kdcom.spec ADD_IMPORTLIB) +spec2def(kdcom.dll kdcom.spec) add_library(kdcom SHARED kdcom.c diff --git a/reactos/drivers/battery/battc/CMakeLists.txt b/reactos/drivers/battery/battc/CMakeLists.txt index 8459d107802..2cfea3ab8b0 100644 --- a/reactos/drivers/battery/battc/CMakeLists.txt +++ b/reactos/drivers/battery/battc/CMakeLists.txt @@ -1,7 +1,7 @@ add_definitions(-D_BATTERYCLASS_) -spec2def(battc.sys battc.spec ADD_IMPORTLIB) +spec2def(batc.sys battc.spec) add_library(battc SHARED battc.c diff --git a/reactos/drivers/directx/dxgthk/CMakeLists.txt b/reactos/drivers/directx/dxgthk/CMakeLists.txt index 7993a5e7ac2..cd1dbc827cc 100644 --- a/reactos/drivers/directx/dxgthk/CMakeLists.txt +++ b/reactos/drivers/directx/dxgthk/CMakeLists.txt @@ -1,5 +1,5 @@ -spec2def(dxgthk.sys dxgthk.spec ADD_IMPORTLIB) +spec2def(dxgthk.sys dxgthk.spec) list(APPEND SOURCE main.c diff --git a/reactos/drivers/ksfilter/ks/CMakeLists.txt b/reactos/drivers/ksfilter/ks/CMakeLists.txt index ecae359430a..712848b6b2f 100644 --- a/reactos/drivers/ksfilter/ks/CMakeLists.txt +++ b/reactos/drivers/ksfilter/ks/CMakeLists.txt @@ -1,5 +1,5 @@ -spec2def(ks.sys ks.spec ADD_IMPORTLIB) +spec2def(ks.sys ks.spec) add_definitions( -DBUILDING_KS diff --git a/reactos/drivers/network/ndis/CMakeLists.txt b/reactos/drivers/network/ndis/CMakeLists.txt index 3d013ad2563..f548a1b17d9 100644 --- a/reactos/drivers/network/ndis/CMakeLists.txt +++ b/reactos/drivers/network/ndis/CMakeLists.txt @@ -10,7 +10,7 @@ add_definitions( -DNDIS_LEGACY_PROTOCOL -DNDIS_MINIPORT_DRIVER) -spec2def(ndis.sys ndis.spec ADD_IMPORTLIB) +spec2def(ndis.sys ndis.spec) list(APPEND SOURCE ndis/30stubs.c diff --git a/reactos/drivers/storage/class/class2/CMakeLists.txt b/reactos/drivers/storage/class/class2/CMakeLists.txt index e490aea989b..8820226b9ce 100644 --- a/reactos/drivers/storage/class/class2/CMakeLists.txt +++ b/reactos/drivers/storage/class/class2/CMakeLists.txt @@ -1,7 +1,7 @@ include_directories(..) -spec2def(class2.sys class2.spec ADD_IMPORTLIB) +spec2def(class2.sys class2.spec) list(APPEND SOURCE class2.c diff --git a/reactos/drivers/storage/ide/pciidex/CMakeLists.txt b/reactos/drivers/storage/ide/pciidex/CMakeLists.txt index 3d4f46d6aa9..c3365ce51b9 100644 --- a/reactos/drivers/storage/ide/pciidex/CMakeLists.txt +++ b/reactos/drivers/storage/ide/pciidex/CMakeLists.txt @@ -1,5 +1,5 @@ -spec2def(pciidex.sys pciidex.spec ADD_IMPORTLIB) +spec2def(pciidex.sys pciidex.spec) list(APPEND SOURCE fdo.c diff --git a/reactos/drivers/storage/scsiport/CMakeLists.txt b/reactos/drivers/storage/scsiport/CMakeLists.txt index 9a95a91b8c5..2be2a018591 100644 --- a/reactos/drivers/storage/scsiport/CMakeLists.txt +++ b/reactos/drivers/storage/scsiport/CMakeLists.txt @@ -1,5 +1,5 @@ -spec2def(scsiport.sys scsiport.spec ADD_IMPORTLIB) +spec2def(scsiport.sys scsiport.spec) list(APPEND SOURCE scsiport.c diff --git a/reactos/drivers/usb/usbd/CMakeLists.txt b/reactos/drivers/usb/usbd/CMakeLists.txt index dd67fdb275f..5f30aab7530 100644 --- a/reactos/drivers/usb/usbd/CMakeLists.txt +++ b/reactos/drivers/usb/usbd/CMakeLists.txt @@ -1,5 +1,5 @@ -spec2def(usbd.sys usbd.spec ADD_IMPORTLIB) +spec2def(usbd.sys usbd.spec) add_library(usbd SHARED usbd.c diff --git a/reactos/drivers/video/font/ftfd/CMakeLists.txt b/reactos/drivers/video/font/ftfd/CMakeLists.txt index a5d3d4d13b4..72458f71082 100644 --- a/reactos/drivers/video/font/ftfd/CMakeLists.txt +++ b/reactos/drivers/video/font/ftfd/CMakeLists.txt @@ -1,7 +1,7 @@ include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/freetype/include) -spec2def(ftfd.dll ftfd.spec ADD_IMPORTLIB) +spec2def(ftfd.dll ftfd.spec) add_library(ftfd SHARED enable.c diff --git a/reactos/drivers/video/videoprt/CMakeLists.txt b/reactos/drivers/video/videoprt/CMakeLists.txt index d206ed657d7..1eea498eb64 100644 --- a/reactos/drivers/video/videoprt/CMakeLists.txt +++ b/reactos/drivers/video/videoprt/CMakeLists.txt @@ -3,7 +3,7 @@ include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) add_definitions(-D_VIDEOPORT_) -spec2def(videoprt.sys videoprt.spec ADD_IMPORTLIB) +spec2def(videoprt.sys videoprt.spec) list(APPEND SOURCE agp.c diff --git a/reactos/drivers/wdm/audio/drm/drmk/CMakeLists.txt b/reactos/drivers/wdm/audio/drm/drmk/CMakeLists.txt index ee6e22a8f7b..eb70b994869 100644 --- a/reactos/drivers/wdm/audio/drm/drmk/CMakeLists.txt +++ b/reactos/drivers/wdm/audio/drm/drmk/CMakeLists.txt @@ -1,7 +1,7 @@ add_definitions(-DBUILDING_DRMK) -spec2def(drmk.sys drmk.spec ADD_IMPORTLIB) +spec2def(drmk.sys drmk.spec) list(APPEND SOURCE stubs.cpp diff --git a/reactos/drivers/wmi/CMakeLists.txt b/reactos/drivers/wmi/CMakeLists.txt index 45e7b9a87d1..c00a650c931 100644 --- a/reactos/drivers/wmi/CMakeLists.txt +++ b/reactos/drivers/wmi/CMakeLists.txt @@ -1,5 +1,5 @@ -spec2def(wmilib.sys wmilib.spec ADD_IMPORTLIB) +spec2def(wmilib.sys wmilib.spec) list(APPEND SOURCE wmilib.c diff --git a/reactos/hal/halx86/CMakeLists.txt b/reactos/hal/halx86/CMakeLists.txt index 09086cfd9bf..13b14ccbc11 100644 --- a/reactos/hal/halx86/CMakeLists.txt +++ b/reactos/hal/halx86/CMakeLists.txt @@ -79,7 +79,7 @@ if(ARCH MATCHES i386) up/pic.c up/processor.c) - spec2def(hal.dll ../hal.spec ADD_IMPORTLIB) + spec2def(hal.dll ../hal.spec) list(APPEND HAL_SOURCE ${HAL_GENERIC_SOURCE} diff --git a/reactos/ntoskrnl/CMakeLists.txt b/reactos/ntoskrnl/CMakeLists.txt index 391a6ce7ad8..39320374960 100644 --- a/reactos/ntoskrnl/CMakeLists.txt +++ b/reactos/ntoskrnl/CMakeLists.txt @@ -1,5 +1,5 @@ -spec2def(ntoskrnl.exe ntoskrnl.spec ADD_IMPORTLIB) +spec2def(ntoskrnl.exe ntoskrnl.spec) include_directories( ${REACTOS_SOURCE_DIR} diff --git a/reactos/subsystems/win32/csrss/csrsrv/CMakeLists.txt b/reactos/subsystems/win32/csrss/csrsrv/CMakeLists.txt index f77acef44f8..26989823cf9 100644 --- a/reactos/subsystems/win32/csrss/csrsrv/CMakeLists.txt +++ b/reactos/subsystems/win32/csrss/csrsrv/CMakeLists.txt @@ -2,7 +2,7 @@ include_directories(${REACTOS_SOURCE_DIR}/subsystems/win32/csrss/include) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys) -spec2def(csrsrv.dll csrsrv.spec ADD_IMPORTLIB) +spec2def(csrsrv.dll csrsrv.spec) list(APPEND SOURCE api/process.c diff --git a/reactos/subsystems/win32/win32k/CMakeLists.txt b/reactos/subsystems/win32/win32k/CMakeLists.txt index 5ce5175edaa..649880cf4b9 100644 --- a/reactos/subsystems/win32/win32k/CMakeLists.txt +++ b/reactos/subsystems/win32/win32k/CMakeLists.txt @@ -1,5 +1,5 @@ -spec2def(win32k.sys win32k.spec ADD_IMPORTLIB) +spec2def(win32k.sys win32k.spec) include_directories( .