From 4bdb6a42f22b200cab66ce9634a30ac330e67faf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Gardou?= Date: Wed, 7 Mar 2012 21:21:27 +0000 Subject: [PATCH] [CMAKE] * unify spec2def and add_importlib_target * use module name instead of spec file name for deciding importlib target name svn path=/trunk/; revision=56081 --- .../shell/explorer/notifyhook/CMakeLists.txt | 4 +- reactos/cmake/gcc.cmake | 65 ++++++++------- reactos/cmake/msvc.cmake | 82 ++++++++++--------- reactos/dll/cpl/odbccp32/CMakeLists.txt | 5 +- reactos/dll/directx/dinput/CMakeLists.txt | 4 +- reactos/dll/directx/dinput8/CMakeLists.txt | 4 +- reactos/dll/directx/dplay/CMakeLists.txt | 2 +- reactos/dll/directx/dplayx/CMakeLists.txt | 4 +- reactos/dll/directx/dsound/CMakeLists.txt | 4 +- reactos/dll/directx/ksuser/CMakeLists.txt | 4 +- reactos/dll/directx/wine/d3d9/CMakeLists.txt | 4 +- .../dll/directx/wine/d3dx9_24/CMakeLists.txt | 4 +- .../dll/directx/wine/d3dx9_25/CMakeLists.txt | 2 +- .../dll/directx/wine/d3dx9_36/CMakeLists.txt | 3 +- reactos/dll/directx/wine/ddraw/CMakeLists.txt | 4 +- .../dll/directx/wine/wined3d/CMakeLists.txt | 4 +- reactos/dll/ntdll/CMakeLists.txt | 4 +- reactos/dll/win32/acledit/CMakeLists.txt | 2 +- reactos/dll/win32/aclui/CMakeLists.txt | 2 +- reactos/dll/win32/advapi32/CMakeLists.txt | 4 +- reactos/dll/win32/atl/CMakeLists.txt | 4 +- reactos/dll/win32/avicap32/CMakeLists.txt | 4 +- reactos/dll/win32/avifil32/CMakeLists.txt | 4 +- reactos/dll/win32/batt/CMakeLists.txt | 2 +- reactos/dll/win32/beepmidi/CMakeLists.txt | 2 +- reactos/dll/win32/cabinet/CMakeLists.txt | 4 +- reactos/dll/win32/cards/CMakeLists.txt | 2 +- reactos/dll/win32/comctl32/CMakeLists.txt | 4 +- reactos/dll/win32/comdlg32/CMakeLists.txt | 4 +- reactos/dll/win32/compstui/CMakeLists.txt | 2 +- reactos/dll/win32/credui/CMakeLists.txt | 4 +- reactos/dll/win32/crypt32/CMakeLists.txt | 4 +- reactos/dll/win32/cryptnet/CMakeLists.txt | 4 +- reactos/dll/win32/cryptui/CMakeLists.txt | 4 +- reactos/dll/win32/dbghelp/CMakeLists.txt | 4 +- reactos/dll/win32/devmgr/CMakeLists.txt | 4 +- reactos/dll/win32/dhcpcsvc/CMakeLists.txt | 4 +- reactos/dll/win32/dnsapi/CMakeLists.txt | 4 +- reactos/dll/win32/fmifs/CMakeLists.txt | 4 +- reactos/dll/win32/gdi32/CMakeLists.txt | 4 +- reactos/dll/win32/gdiplus/CMakeLists.txt | 4 +- reactos/dll/win32/getuname/CMakeLists.txt | 2 +- reactos/dll/win32/glu32/CMakeLists.txt | 4 +- reactos/dll/win32/hlink/CMakeLists.txt | 4 +- reactos/dll/win32/icmp/CMakeLists.txt | 4 +- reactos/dll/win32/imagehlp/CMakeLists.txt | 4 +- reactos/dll/win32/imm32/CMakeLists.txt | 4 +- reactos/dll/win32/inetcomm/CMakeLists.txt | 4 +- reactos/dll/win32/iphlpapi/CMakeLists.txt | 4 +- reactos/dll/win32/kernel32/CMakeLists.txt | 4 +- reactos/dll/win32/loadperf/CMakeLists.txt | 4 +- reactos/dll/win32/localui/CMakeLists.txt | 2 +- reactos/dll/win32/lpk/CMakeLists.txt | 2 +- reactos/dll/win32/lsasrv/CMakeLists.txt | 4 +- reactos/dll/win32/lz32/CMakeLists.txt | 4 +- reactos/dll/win32/mlang/CMakeLists.txt | 4 +- reactos/dll/win32/mpr/CMakeLists.txt | 4 +- reactos/dll/win32/msacm32/CMakeLists.txt | 4 +- reactos/dll/win32/msi/CMakeLists.txt | 4 +- reactos/dll/win32/msimg32/CMakeLists.txt | 4 +- reactos/dll/win32/msports/CMakeLists.txt | 2 +- reactos/dll/win32/msvcrt/CMakeLists.txt | 4 +- reactos/dll/win32/msvfw32/CMakeLists.txt | 4 +- reactos/dll/win32/mswsock/CMakeLists.txt | 4 +- reactos/dll/win32/netapi32/CMakeLists.txt | 4 +- reactos/dll/win32/newdev/CMakeLists.txt | 4 +- reactos/dll/win32/ntdsapi/CMakeLists.txt | 4 +- reactos/dll/win32/odbccp32/CMakeLists.txt | 4 +- reactos/dll/win32/ole32/CMakeLists.txt | 4 +- reactos/dll/win32/oleacc/CMakeLists.txt | 4 +- reactos/dll/win32/oleaut32/CMakeLists.txt | 4 +- reactos/dll/win32/oledlg/CMakeLists.txt | 4 +- reactos/dll/win32/opengl32/CMakeLists.txt | 4 +- reactos/dll/win32/pdh/CMakeLists.txt | 4 +- reactos/dll/win32/powrprof/CMakeLists.txt | 4 +- reactos/dll/win32/psapi/CMakeLists.txt | 4 +- reactos/dll/win32/rasapi32/CMakeLists.txt | 4 +- reactos/dll/win32/riched20/CMakeLists.txt | 4 +- reactos/dll/win32/rpcrt4/CMakeLists.txt | 6 +- reactos/dll/win32/rsaenh/CMakeLists.txt | 4 +- reactos/dll/win32/samlib/CMakeLists.txt | 4 +- reactos/dll/win32/secur32/CMakeLists.txt | 4 +- reactos/dll/win32/sensapi/CMakeLists.txt | 4 +- reactos/dll/win32/setupapi/CMakeLists.txt | 4 +- reactos/dll/win32/sfc_os/CMakeLists.txt | 4 +- reactos/dll/win32/shdocvw/CMakeLists.txt | 4 +- reactos/dll/win32/shell32/CMakeLists.txt | 4 +- reactos/dll/win32/shlwapi/CMakeLists.txt | 4 +- reactos/dll/win32/smdll/CMakeLists.txt | 4 +- reactos/dll/win32/snmpapi/CMakeLists.txt | 4 +- reactos/dll/win32/spoolss/CMakeLists.txt | 4 +- reactos/dll/win32/ufatx/CMakeLists.txt | 2 +- reactos/dll/win32/urlmon/CMakeLists.txt | 4 +- reactos/dll/win32/user32/CMakeLists.txt | 4 +- reactos/dll/win32/userenv/CMakeLists.txt | 4 +- reactos/dll/win32/usp10/CMakeLists.txt | 4 +- reactos/dll/win32/uxtheme/CMakeLists.txt | 4 +- reactos/dll/win32/version/CMakeLists.txt | 4 +- .../dll/win32/windowscodecs/CMakeLists.txt | 4 +- reactos/dll/win32/winhttp/CMakeLists.txt | 4 +- reactos/dll/win32/wininet/CMakeLists.txt | 4 +- reactos/dll/win32/winmm/CMakeLists.txt | 4 +- reactos/dll/win32/winspool/CMakeLists.txt | 4 +- reactos/dll/win32/wintrust/CMakeLists.txt | 4 +- reactos/dll/win32/wlanapi/CMakeLists.txt | 4 +- reactos/dll/win32/wldap32/CMakeLists.txt | 4 +- reactos/dll/win32/ws2_32/CMakeLists.txt | 4 +- reactos/dll/win32/ws2_32_new/CMakeLists.txt | 2 +- reactos/dll/win32/ws2help/CMakeLists.txt | 4 +- reactos/dll/win32/xinput1_3/CMakeLists.txt | 4 +- reactos/dll/win32/xmllite/CMakeLists.txt | 4 +- reactos/drivers/base/bootvid/CMakeLists.txt | 4 +- reactos/drivers/base/kdcom/CMakeLists.txt | 4 +- reactos/drivers/base/kddll/CMakeLists.txt | 4 +- reactos/drivers/battery/battc/CMakeLists.txt | 4 +- reactos/drivers/directx/dxgthk/CMakeLists.txt | 4 +- reactos/drivers/hid/hidclass/CMakeLists.txt | 4 +- reactos/drivers/hid/hidparse/CMakeLists.txt | 3 +- reactos/drivers/ksfilter/ks/CMakeLists.txt | 4 +- reactos/drivers/network/ndis/CMakeLists.txt | 4 +- .../storage/class/class2/CMakeLists.txt | 4 +- .../drivers/storage/classpnp/CMakeLists.txt | 4 +- .../storage/ide/pciidex/CMakeLists.txt | 4 +- .../drivers/storage/scsiport/CMakeLists.txt | 4 +- reactos/drivers/usb/usbd/CMakeLists.txt | 4 +- .../drivers/video/font/ftfd/CMakeLists.txt | 4 +- reactos/drivers/video/videoprt/CMakeLists.txt | 4 +- .../drivers/wdm/audio/drm/drmk/CMakeLists.txt | 4 +- reactos/drivers/wmi/CMakeLists.txt | 4 +- reactos/hal/halx86/CMakeLists.txt | 8 +- reactos/ntoskrnl/CMakeLists.txt | 4 +- reactos/subsystems/csr/csrsrv/CMakeLists.txt | 4 +- .../win32/csrss/csrsrv/CMakeLists.txt | 4 +- .../subsystems/win32/win32k/CMakeLists.txt | 4 +- 134 files changed, 327 insertions(+), 325 deletions(-) diff --git a/reactos/base/shell/explorer/notifyhook/CMakeLists.txt b/reactos/base/shell/explorer/notifyhook/CMakeLists.txt index 8a2768ca989..935fc1d574a 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) +spec2def(notifyhook.dll notifyhook.spec ADD_IMPORTLIB) list(APPEND SOURCE notifyhook.c @@ -13,5 +13,5 @@ add_library(notifyhook SHARED ${SOURCE}) set_module_type(notifyhook win32dll) add_importlibs(notifyhook user32 msvcrt kernel32) -add_importlib_target(notifyhook.spec notifyhook.dll) + add_cd_file(TARGET notifyhook DESTINATION reactos/system32 FOR all) diff --git a/reactos/cmake/gcc.cmake b/reactos/cmake/gcc.cmake index 8d6460477a9..50a5234b4e8 100644 --- a/reactos/cmake/gcc.cmake +++ b/reactos/cmake/gcc.cmake @@ -32,7 +32,6 @@ else() add_compile_flags("-gstabs+") endif() - # Do not allow warnings add_compile_flags("-Werror") @@ -227,46 +226,46 @@ endif() # Cute little hack to produce import libs set(CMAKE_IMPLIB_CREATE_STATIC_LIBRARY "${CMAKE_DLLTOOL} --def --kill-at --output-lib=") set(CMAKE_IMPLIB_DELAYED_CREATE_STATIC_LIBRARY "${CMAKE_DLLTOOL} --def --kill-at --output-delaylib=") -function(add_importlib_target _exports_file _implib_name) - get_filename_component(_name ${_exports_file} NAME_WE) - get_filename_component(_extension ${_exports_file} EXT) - - if(${_extension} STREQUAL ".spec") - - # generate .def - add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_name}_implib.def - COMMAND native-spec2def -n=${_implib_name} -a=${ARCH2} -d=${CMAKE_CURRENT_BINARY_DIR}/${_name}_implib.def ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} native-spec2def) - set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_name}_implib.def PROPERTIES EXTERNAL_OBJECT TRUE) - - #create normal importlib - add_library(lib${_name} STATIC EXCLUDE_FROM_ALL ${CMAKE_CURRENT_BINARY_DIR}/${_name}_implib.def) - set_target_properties(lib${_name} PROPERTIES LINKER_LANGUAGE "IMPLIB" PREFIX "") - - #create delayed importlib - add_library(lib${_name}_delayed STATIC EXCLUDE_FROM_ALL ${CMAKE_CURRENT_BINARY_DIR}/${_name}_implib.def) - set_target_properties(lib${_name}_delayed PROPERTIES LINKER_LANGUAGE "IMPLIB_DELAYED" PREFIX "") - else() - message(FATAL_ERROR "Unsupported exports file extension: ${_extension}") - endif() -endfunction() - function(spec2def _dllname _spec_file) - + # do we also want to add impotlib targets? if(${ARGC} GREATER 2) - set(_file ${ARGV2}) - else() - get_filename_component(_file ${_spec_file} NAME_WE) + if(${ARGN} STREQUAL "ADD_IMPORTLIB") + set(__add_importlib TRUE) + else() + message(FATAL_ERROR "Wrong argument passed to spec2def, ${ARGN}") + endif() + endif() + + # get library basename + get_filename_component(_file ${_dllname} NAME_WE) + + # error out on anything else than spec + if(NOT ${_spec_file} MATCHES ".*\\.spec") + message(FATAL_ERROR "spec2def only takes spec files as input.") endif() + # generate exports def and stubs C file for the module add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def ${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c COMMAND native-spec2def -n=${_dllname} --kill-at -a=${ARCH2} -d=${CMAKE_CURRENT_BINARY_DIR}/${_file}.def -s=${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} native-spec2def) - set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_file}.def - PROPERTIES GENERATED TRUE EXTERNAL_OBJECT TRUE) - set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c PROPERTIES GENERATED TRUE) + + if(__add_importlib) + # generate the def for the export lib + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file}_implib.def + COMMAND native-spec2def -n=${_dllname} -a=${ARCH2} -d=${CMAKE_CURRENT_BINARY_DIR}/${_file}_implib.def ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} native-spec2def) + set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_file}_implib.def PROPERTIES EXTERNAL_OBJECT TRUE) + + #create normal importlib + _add_library(lib${_file} STATIC EXCLUDE_FROM_ALL ${CMAKE_CURRENT_BINARY_DIR}/${_file}_implib.def) + set_target_properties(lib${_file} PROPERTIES LINKER_LANGUAGE "IMPLIB" PREFIX "") + + #create delayed importlib + _add_library(lib${_file}_delayed STATIC EXCLUDE_FROM_ALL ${CMAKE_CURRENT_BINARY_DIR}/${_file}_implib.def) + set_target_properties(lib${_file}_delayed PROPERTIES LINKER_LANGUAGE "IMPLIB_DELAYED" PREFIX "") + endif() endfunction() macro(macro_mc FLAG FILE) diff --git a/reactos/cmake/msvc.cmake b/reactos/cmake/msvc.cmake index 56f05e7f225..56db44fec64 100644 --- a/reactos/cmake/msvc.cmake +++ b/reactos/cmake/msvc.cmake @@ -40,13 +40,6 @@ if(${_MACHINE_ARCH_FLAG} MATCHES X86) set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /SAFESEH:NO /NODEFAULTLIB /RELEASE") endif() -if(${ARCH} MATCHES amd64) - add_definitions(/D__x86_64) - set(SPEC2DEF_ARCH x86_64) -else() - set(SPEC2DEF_ARCH i386) -endif() - set(CMAKE_RC_COMPILE_OBJECT " ${I18N_DEFS} /I${REACTOS_SOURCE_DIR}/include/psdk /I${REACTOS_BINARY_DIR}/include/psdk /I${REACTOS_SOURCE_DIR}/include /I${REACTOS_SOURCE_DIR}/include/reactos /I${REACTOS_BINARY_DIR}/include/reactos /I${REACTOS_SOURCE_DIR}/include/reactos/wine /I${REACTOS_SOURCE_DIR}/include/crt /I${REACTOS_SOURCE_DIR}/include/crt/mingw32 /fo ") if(MSVC_IDE) @@ -135,34 +128,6 @@ endfunction() #define those for having real libraries set(CMAKE_IMPLIB_CREATE_STATIC_LIBRARY "LINK /LIB /NOLOGO /OUT: ") set(CMAKE_STUB_ASM_COMPILE_OBJECT " /Cp /Fo /c /Ta ") -# Thanks MS for creating a stupid linker -function(add_importlib_target _exports_file _implib_name) - - get_filename_component(_name ${_exports_file} NAME_WE) - - # Generate the asm stub file and the export def file - add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lib${_name}_stubs.asm ${CMAKE_CURRENT_BINARY_DIR}/lib${_name}_exp.def - COMMAND native-spec2def --ms --kill-at -a=${SPEC2DEF_ARCH} --implib -n=${_implib_name} -d=${CMAKE_CURRENT_BINARY_DIR}/lib${_name}_exp.def -l=${CMAKE_CURRENT_BINARY_DIR}/lib${_name}_stubs.asm ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} native-spec2def) - # be clear about the language - set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/lib${_name}_stubs.asm PROPERTIES LANGUAGE "STUB_ASM") - - # add our library - # NOTE: as stub file and def file are generated in one pass, depending on one is like depending on the other - add_library(lib${_name} STATIC EXCLUDE_FROM_ALL - ${CMAKE_CURRENT_BINARY_DIR}/lib${_name}_stubs.asm) - - # Add necessary importlibs for redirections. Still necessary ? - if(ARGN) - target_link_libraries(lib${_name} ${ARGN}) - endif() - - # set correct link rule - set_target_properties(lib${_name} PROPERTIES LINKER_LANGUAGE "IMPLIB" - STATIC_LIBRARY_FLAGS "/DEF:${CMAKE_CURRENT_BINARY_DIR}\\lib${_name}_exp.def") -endfunction() - macro(add_delay_importlibs MODULE) foreach(LIB ${ARGN}) add_target_link_flags(${MODULE} "/DELAYLOAD:${LIB}.dll") @@ -171,18 +136,55 @@ macro(add_delay_importlibs MODULE) target_link_libraries(${MODULE} delayimp) endmacro() +if(${ARCH} MATCHES amd64) + add_definitions(/D__x86_64) + set(SPEC2DEF_ARCH x86_64) +else() + set(SPEC2DEF_ARCH i386) +endif() function(spec2def _dllname _spec_file) + # do we also want to add impotlib targets? if(${ARGC} GREATER 2) - set(_file ${ARGV2}) - else() - get_filename_component(_file ${_spec_file} NAME_WE) + if(${ARGN} STREQUAL "ADD_IMPORTLIB") + set(__add_importlib TRUE) + else() + message(FATAL_ERROR "Wrong argument passed to spec2def, ${ARGN}") + endif() endif() + + # get library basename + get_filename_component(_file ${_dllname} NAME_WE) + + # error out on anything else than spec + if(NOT ${_spec_file} MATCHES ".*\\.spec") + message(FATAL_ERROR "spec2def only takes spec files as input.") + endif() + + #generate def for the DLL and C stubs file add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def ${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c COMMAND native-spec2def --ms --kill-at -a=${SPEC2DEF_ARCH} -n=${_dllname} -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} native-spec2def) - set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_file}.def ${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c - PROPERTIES GENERATED TRUE) + + if(__add_importlib) + # Generate the asm stub file and the export def file for import library + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lib${_file}_stubs.asm ${CMAKE_CURRENT_BINARY_DIR}/lib${_file}_exp.def + COMMAND native-spec2def --ms --kill-at -a=${SPEC2DEF_ARCH} --implib -n=${_dllname} -d=${CMAKE_CURRENT_BINARY_DIR}/lib${_file}_exp.def -l=${CMAKE_CURRENT_BINARY_DIR}/lib${_file}_stubs.asm ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} native-spec2def) + # be clear about the "language" + # Thanks MS for creating a stupid linker + set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/lib${_file}_stubs.asm PROPERTIES LANGUAGE "STUB_ASM") + + # add our library + # NOTE: as stub file and def file are generated in one pass, depending on one is like depending on the other + _add_library(lib${_file} STATIC EXCLUDE_FROM_ALL + ${CMAKE_CURRENT_BINARY_DIR}/lib${_file}_stubs.asm) + + # set correct "link rule" + set_target_properties(lib${_file} PROPERTIES LINKER_LANGUAGE "IMPLIB" + STATIC_LIBRARY_FLAGS "/DEF:${CMAKE_CURRENT_BINARY_DIR}\\lib${_file}_exp.def") + endif() endfunction() macro(macro_mc FLAG FILE) diff --git a/reactos/dll/cpl/odbccp32/CMakeLists.txt b/reactos/dll/cpl/odbccp32/CMakeLists.txt index 085bae195c3..10010457c97 100644 --- a/reactos/dll/cpl/odbccp32/CMakeLists.txt +++ b/reactos/dll/cpl/odbccp32/CMakeLists.txt @@ -2,7 +2,10 @@ spec2def(odbccp32i.cpl odbccp32.spec) -add_library(odbccp32i SHARED odbccp32.c odbccp32.rc ${CMAKE_CURRENT_BINARY_DIR}/odbccp32.def) +add_library(odbccp32i SHARED + odbccp32.c + odbccp32.rc + ${CMAKE_CURRENT_BINARY_DIR}/odbccp32i.def) set_module_type(odbccp32i cpl UNICODE) diff --git a/reactos/dll/directx/dinput/CMakeLists.txt b/reactos/dll/directx/dinput/CMakeLists.txt index 88d7dbb7b9a..6bc517739cb 100644 --- a/reactos/dll/directx/dinput/CMakeLists.txt +++ b/reactos/dll/directx/dinput/CMakeLists.txt @@ -5,7 +5,7 @@ add_definitions(-D_WIN32_WINNT=0x600) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(dinput.dll dinput.spec) +spec2def(dinput.dll dinput.spec ADD_IMPORTLIB) add_library(dinput SHARED data_formats.c @@ -37,4 +37,4 @@ add_importlibs(dinput ntdll) add_cd_file(TARGET dinput DESTINATION reactos/system32 FOR all) -add_importlib_target(dinput.spec dinput.dll) + diff --git a/reactos/dll/directx/dinput8/CMakeLists.txt b/reactos/dll/directx/dinput8/CMakeLists.txt index e3320dac1aa..52a55fbdcf0 100644 --- a/reactos/dll/directx/dinput8/CMakeLists.txt +++ b/reactos/dll/directx/dinput8/CMakeLists.txt @@ -5,7 +5,7 @@ add_definitions(-D_WIN32_WINNT=0x600) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(dinput8.dll dinput8.spec) +spec2def(dinput8.dll dinput8.spec ADD_IMPORTLIB) add_library(dinput8 SHARED dinput8_main.c @@ -32,4 +32,4 @@ add_importlibs(dinput8 add_dependencies(dinput8 psdk) add_cd_file(TARGET dinput8 DESTINATION reactos/system32 FOR all) -add_importlib_target(dinput8.spec dinput8.dll) + diff --git a/reactos/dll/directx/dplay/CMakeLists.txt b/reactos/dll/directx/dplay/CMakeLists.txt index 56d054ea9e3..6f0b9da9500 100644 --- a/reactos/dll/directx/dplay/CMakeLists.txt +++ b/reactos/dll/directx/dplay/CMakeLists.txt @@ -27,4 +27,4 @@ add_importlibs(dplay add_dependencies(dplay psdk) add_cd_file(TARGET dplay DESTINATION reactos/system32 FOR all) -add_importlib_target(dplay.spec dplay.dll libdplayx) + diff --git a/reactos/dll/directx/dplayx/CMakeLists.txt b/reactos/dll/directx/dplayx/CMakeLists.txt index d93cc69df3a..05893e574d5 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) +spec2def(dplayx.dll dplayx.spec ADD_IMPORTLIB) list(APPEND SOURCE dpclassfactory.c @@ -37,4 +37,4 @@ add_importlibs(dplayx ntdll) add_cd_file(TARGET dplayx DESTINATION reactos/system32 FOR all) -add_importlib_target(dplayx.spec dplayx.dll) + diff --git a/reactos/dll/directx/dsound/CMakeLists.txt b/reactos/dll/directx/dsound/CMakeLists.txt index 386b25070ea..5dfef621b30 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) +spec2def(dsound.dll dsound.spec ADD_IMPORTLIB) add_library(dsound SHARED buffer.c @@ -39,4 +39,4 @@ add_importlibs(dsound ntdll) add_cd_file(TARGET dsound DESTINATION reactos/system32 FOR all) -add_importlib_target(dsound.spec dsound.dll) + diff --git a/reactos/dll/directx/ksuser/CMakeLists.txt b/reactos/dll/directx/ksuser/CMakeLists.txt index c0a5d379719..50993f759c6 100644 --- a/reactos/dll/directx/ksuser/CMakeLists.txt +++ b/reactos/dll/directx/ksuser/CMakeLists.txt @@ -1,5 +1,5 @@ -spec2def(ksuser.dll ksuser.spec) +spec2def(ksuser.dll ksuser.spec ADD_IMPORTLIB) add_library(ksuser SHARED ksuser.c ksuser.rc ${CMAKE_CURRENT_BINARY_DIR}/ksuser.def) @@ -8,4 +8,4 @@ set_module_type(ksuser win32dll) add_importlibs(ksuser advapi32 msvcrt kernel32 ntdll) add_dependencies(ksuser psdk bugcodes) add_cd_file(TARGET ksuser DESTINATION reactos/system32 FOR all) -add_importlib_target(ksuser.spec ksuser.dll) + diff --git a/reactos/dll/directx/wine/d3d9/CMakeLists.txt b/reactos/dll/directx/wine/d3d9/CMakeLists.txt index f44bdd79226..cebe9e1c8f8 100644 --- a/reactos/dll/directx/wine/d3d9/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3d9/CMakeLists.txt @@ -8,7 +8,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) set_rc_compiler() -spec2def(d3d9.dll d3d9.spec) +spec2def(d3d9.dll d3d9.spec ADD_IMPORTLIB) list(APPEND SOURCE buffer.c @@ -47,4 +47,4 @@ add_importlibs(d3d9 add_dependencies(d3d9 wineheaders) add_pch(d3d9 d3d9_private.h) add_cd_file(TARGET d3d9 DESTINATION reactos/system32 FOR all) -add_importlib_target(d3d9.spec d3d9.dll) + diff --git a/reactos/dll/directx/wine/d3dx9_24/CMakeLists.txt b/reactos/dll/directx/wine/d3dx9_24/CMakeLists.txt index 8befd21e559..6b10e93bd7b 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) +spec2def(d3dx9_24.dll d3dx9_24.spec ADD_IMPORTLIB) list(APPEND SOURCE d3dx9_24_main.c @@ -30,4 +30,4 @@ add_importlibs(d3dx9_24 add_dependencies(d3dx9_24 wineheaders) add_cd_file(TARGET d3dx9_24 DESTINATION reactos/system32 FOR all) -add_importlib_target(d3dx9_24.spec d3dx9_24.dll libd3dx9_36) + diff --git a/reactos/dll/directx/wine/d3dx9_25/CMakeLists.txt b/reactos/dll/directx/wine/d3dx9_25/CMakeLists.txt index 9c4e7f42f5e..a3138e8e6b1 100644 --- a/reactos/dll/directx/wine/d3dx9_25/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3dx9_25/CMakeLists.txt @@ -31,4 +31,4 @@ add_importlibs(d3dx9_25 add_dependencies(d3dx9_25 wineheaders) add_cd_file(TARGET d3dx9_25 DESTINATION reactos/system32 FOR all) -add_importlib_target(d3dx9_25.spec d3dx9_25.dll libd3dx9_24 libd3dx9_36) + diff --git a/reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt b/reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt index 297ab6c97cf..13ce94f0fe9 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) +spec2def(d3dx9_36.dll d3dx9_36.spec ADD_IMPORTLIB) list(APPEND SOURCE core.c @@ -36,4 +36,3 @@ add_importlibs(d3dx9_36 add_dependencies(d3dx9_36 wineheaders) add_cd_file(TARGET d3dx9_36 DESTINATION reactos/system32 FOR all) -add_importlib_target(d3dx9_36.spec d3dx9_36.dll) diff --git a/reactos/dll/directx/wine/ddraw/CMakeLists.txt b/reactos/dll/directx/wine/ddraw/CMakeLists.txt index 58a609c2afe..33d575576e9 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) +spec2def(ddraw.dll ddraw.spec ADD_IMPORTLIB) list(APPEND SOURCE clipper.c @@ -53,4 +53,4 @@ add_importlibs(ddraw add_dependencies(ddraw wineheaders) add_pch(ddraw ddraw_private.h) add_cd_file(TARGET ddraw DESTINATION reactos/system32 FOR all) -add_importlib_target(ddraw.spec ddraw.dll) + diff --git a/reactos/dll/directx/wine/wined3d/CMakeLists.txt b/reactos/dll/directx/wine/wined3d/CMakeLists.txt index 5926ab03ce0..a65813fce27 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) +spec2def(wined3d.dll wined3d.spec ADD_IMPORTLIB) list(APPEND SOURCE ati_fragment_shader.c @@ -68,7 +68,7 @@ add_importlibs(wined3d add_dependencies(wined3d wineheaders) add_pch(wined3d wined3d_private.h) add_cd_file(TARGET wined3d DESTINATION reactos/system32 FOR all) -add_importlib_target(wined3d.spec wined3d.dll) + if(NOT MSVC) allow_warnings(wined3d) diff --git a/reactos/dll/ntdll/CMakeLists.txt b/reactos/dll/ntdll/CMakeLists.txt index 30bb062bd7a..13d9541f59a 100644 --- a/reactos/dll/ntdll/CMakeLists.txt +++ b/reactos/dll/ntdll/CMakeLists.txt @@ -1,5 +1,5 @@ -spec2def(ntdll.dll def/ntdll.spec) +spec2def(ntdll.dll def/ntdll.spec ADD_IMPORTLIB) add_definitions( -D__NTDLL__ @@ -52,4 +52,4 @@ add_pch(ntdll include/ntdll.h) add_dependencies(ntdll ntstatus asm) add_cd_file(TARGET ntdll DESTINATION reactos/system32 NO_CAB FOR all) -add_importlib_target(def/ntdll.spec ntdll.dll) + diff --git a/reactos/dll/win32/acledit/CMakeLists.txt b/reactos/dll/win32/acledit/CMakeLists.txt index 624370e22c3..e49f5eaa7e4 100644 --- a/reactos/dll/win32/acledit/CMakeLists.txt +++ b/reactos/dll/win32/acledit/CMakeLists.txt @@ -14,4 +14,4 @@ set_module_type(acledit win32dll UNICODE) add_importlibs(acledit msvcrt kernel32 ntdll) add_pch(acledit acleditint.h) add_cd_file(TARGET acledit DESTINATION reactos/system32 FOR all) -add_importlib_target(acledit.spec acledit.dll) + diff --git a/reactos/dll/win32/aclui/CMakeLists.txt b/reactos/dll/win32/aclui/CMakeLists.txt index a347839d9ac..10884cdedd6 100644 --- a/reactos/dll/win32/aclui/CMakeLists.txt +++ b/reactos/dll/win32/aclui/CMakeLists.txt @@ -16,7 +16,7 @@ list(APPEND SOURCE add_library(aclui SHARED ${SOURCE}) allow_warnings(aclui) set_module_type(aclui win32dll UNICODE) -add_importlib_target(aclui.spec aclui.dll) + add_importlibs(aclui user32 gdi32 comctl32 ole32 oleaut32 advapi32 uxtheme msvcrt kernel32 ntdll) add_pch(aclui precomp.h) add_cd_file(TARGET aclui DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/advapi32/CMakeLists.txt b/reactos/dll/win32/advapi32/CMakeLists.txt index 6cf82ea985f..70583227de7 100644 --- a/reactos/dll/win32/advapi32/CMakeLists.txt +++ b/reactos/dll/win32/advapi32/CMakeLists.txt @@ -1,5 +1,5 @@ -spec2def(advapi32.dll advapi32.spec) +spec2def(advapi32.dll advapi32.spec ADD_IMPORTLIB) add_definitions(-D_ADVAPI32_) @@ -65,4 +65,4 @@ add_pch(advapi32 advapi32.h ${CMAKE_CURRENT_BINARY_DIR}/eventlogrpc_c.h) add_cd_file(TARGET advapi32 DESTINATION reactos/system32 FOR all) -add_importlib_target(advapi32.spec advapi32.dll) + diff --git a/reactos/dll/win32/atl/CMakeLists.txt b/reactos/dll/win32/atl/CMakeLists.txt index b5b4bc64e69..3aafd0594e9 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) +spec2def(atl.dll atl.spec ADD_IMPORTLIB) list(APPEND SOURCE atl_ax.c @@ -37,7 +37,7 @@ add_importlibs(atl kernel32 ntdll) -add_importlib_target(atl.spec atl.dll) + add_dependencies(atl atl_atliface_header) add_cd_file(TARGET atl DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/avicap32/CMakeLists.txt b/reactos/dll/win32/avicap32/CMakeLists.txt index 3447be905ea..85f843dd21d 100644 --- a/reactos/dll/win32/avicap32/CMakeLists.txt +++ b/reactos/dll/win32/avicap32/CMakeLists.txt @@ -1,5 +1,5 @@ -spec2def(avicap32.dll avicap32.spec) +spec2def(avicap32.dll avicap32.spec ADD_IMPORTLIB) add_library(avicap32 SHARED @@ -14,4 +14,4 @@ target_link_libraries(avicap32 wine) add_importlibs(avicap32 advapi32 user32 version msvcrt kernel32 ntdll) add_cd_file(TARGET avicap32 DESTINATION reactos/system32 FOR all) -add_importlib_target(avicap32.spec avicap32.dll) + diff --git a/reactos/dll/win32/avifil32/CMakeLists.txt b/reactos/dll/win32/avifil32/CMakeLists.txt index 88705de378a..992880ec9b1 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) +spec2def(avifil32.dll avifil32.spec ADD_IMPORTLIB) add_library(avifil32 SHARED acmstream.c @@ -40,5 +40,5 @@ add_importlibs(avifil32 kernel32 ntdll) -add_importlib_target(avifil32.spec avifil32.dll) + add_cd_file(TARGET avifil32 DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/batt/CMakeLists.txt b/reactos/dll/win32/batt/CMakeLists.txt index 69f22afe2e0..a51293b749e 100644 --- a/reactos/dll/win32/batt/CMakeLists.txt +++ b/reactos/dll/win32/batt/CMakeLists.txt @@ -10,7 +10,7 @@ add_library(batt SHARED set_module_type(batt win32dll UNICODE) -add_importlib_target(batt.spec batt.dll) + add_importlibs(batt msvcrt kernel32 ntdll) diff --git a/reactos/dll/win32/beepmidi/CMakeLists.txt b/reactos/dll/win32/beepmidi/CMakeLists.txt index 7a87899355c..2c51255d764 100644 --- a/reactos/dll/win32/beepmidi/CMakeLists.txt +++ b/reactos/dll/win32/beepmidi/CMakeLists.txt @@ -10,7 +10,7 @@ add_library(beepmidi SHARED ${SOURCE}) set_module_type(beepmidi win32dll ENTRYPOINT 0 UNICODE) add_importlibs(beepmidi winmm kernel32 ntdll msvcrt) -add_importlib_target(beepmidi.spec beepmidi.dll) + add_dependencies(beepmidi psdk) add_cd_file(TARGET beepmidi DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/cabinet/CMakeLists.txt b/reactos/dll/win32/cabinet/CMakeLists.txt index 1e7a06d5633..6bfab8023a4 100644 --- a/reactos/dll/win32/cabinet/CMakeLists.txt +++ b/reactos/dll/win32/cabinet/CMakeLists.txt @@ -7,7 +7,7 @@ include_directories( ${REACTOS_SOURCE_DIR}/include/reactos/wine ${REACTOS_SOURCE_DIR}/include/reactos/libs/zlib) -spec2def(cabinet.dll cabinet.spec) +spec2def(cabinet.dll cabinet.spec ADD_IMPORTLIB) list(APPEND SOURCE cabinet_main.c @@ -22,7 +22,7 @@ add_library(cabinet SHARED ${SOURCE}) set_module_type(cabinet win32dll ENTRYPOINT 0) target_link_libraries(cabinet wine zlib) add_importlibs(cabinet msvcrt kernel32 ntdll) -add_importlib_target(cabinet.spec cabinet.dll) + add_pch(cabinet cabinet.h) add_dependencies(cabinet psdk) add_cd_file(TARGET cabinet DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/cards/CMakeLists.txt b/reactos/dll/win32/cards/CMakeLists.txt index 1c5993ce9b4..5578bbcd949 100644 --- a/reactos/dll/win32/cards/CMakeLists.txt +++ b/reactos/dll/win32/cards/CMakeLists.txt @@ -16,5 +16,5 @@ add_library(cards SHARED ${SOURCE}) set_module_type(cards win32dll UNICODE) add_importlibs(cards user32 gdi32 msvcrt kernel32) -add_importlib_target(cards.spec cards.dll) + add_cd_file(TARGET cards DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/comctl32/CMakeLists.txt b/reactos/dll/win32/comctl32/CMakeLists.txt index 6765354b89d..1b9d877f7f6 100644 --- a/reactos/dll/win32/comctl32/CMakeLists.txt +++ b/reactos/dll/win32/comctl32/CMakeLists.txt @@ -11,7 +11,7 @@ add_definitions(-D_WIN32_WINNT=0x600) include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(comctl32.dll comctl32.spec) +spec2def(comctl32.dll comctl32.spec ADD_IMPORTLIB) list(APPEND SOURCE animate.c @@ -69,4 +69,4 @@ add_importlibs(comctl32 add_pch(comctl32 comctl32.h) add_cd_file(TARGET comctl32 DESTINATION reactos/system32 FOR all) -add_importlib_target(comctl32.spec comctl32.dll) + diff --git a/reactos/dll/win32/comdlg32/CMakeLists.txt b/reactos/dll/win32/comdlg32/CMakeLists.txt index 4566bba7029..62af43c2ea7 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) +spec2def(comdlg32.dll comdlg32.spec ADD_IMPORTLIB) list(APPEND SOURCE cdlg32.c @@ -41,4 +41,4 @@ add_importlibs(comdlg32 ntdll) add_cd_file(TARGET comdlg32 DESTINATION reactos/system32 FOR all) -add_importlib_target(comdlg32.spec comdlg32.dll) + diff --git a/reactos/dll/win32/compstui/CMakeLists.txt b/reactos/dll/win32/compstui/CMakeLists.txt index 4696e2fe066..f9091be2dfb 100644 --- a/reactos/dll/win32/compstui/CMakeLists.txt +++ b/reactos/dll/win32/compstui/CMakeLists.txt @@ -17,4 +17,4 @@ target_link_libraries(compstui wine) add_importlibs(compstui msvcrt kernel32 ntdll) add_cd_file(TARGET compstui DESTINATION reactos/system32 FOR all) -add_importlib_target(compstui.spec compstui.dll) + diff --git a/reactos/dll/win32/credui/CMakeLists.txt b/reactos/dll/win32/credui/CMakeLists.txt index 8846ce954b7..c13ccf3f2bc 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) +spec2def(credui.dll credui.spec ADD_IMPORTLIB) list(APPEND SOURCE credui_main.c @@ -20,5 +20,5 @@ set_module_type(credui win32dll) target_link_libraries(credui wine) add_importlibs(credui advapi32 user32 comctl32 msvcrt kernel32 ntdll) -add_importlib_target(credui.spec credui.dll) + add_cd_file(TARGET credui DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/crypt32/CMakeLists.txt b/reactos/dll/win32/crypt32/CMakeLists.txt index 8562e480e2b..ac5a952429b 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) +spec2def(crypt32.dll crypt32.spec ADD_IMPORTLIB) list(APPEND SOURCE base64.c @@ -47,4 +47,4 @@ set_module_type(crypt32 win32dll) target_link_libraries(crypt32 wine ${PSEH_LIB} oldnames) add_importlibs(crypt32 user32 advapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET crypt32 DESTINATION reactos/system32 FOR all) -add_importlib_target(crypt32.spec crypt32.dll) + diff --git a/reactos/dll/win32/cryptnet/CMakeLists.txt b/reactos/dll/win32/cryptnet/CMakeLists.txt index 610992bab9c..9ebc0bef22b 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) +spec2def(cryptnet.dll cryptnet.spec ADD_IMPORTLIB) list(APPEND SOURCE cryptnet_main.c @@ -14,5 +14,5 @@ set_module_type(cryptnet win32dll) target_link_libraries(cryptnet wine) add_delay_importlibs(cryptnet wininet) add_importlibs(cryptnet crypt32 msvcrt kernel32 ntdll) -add_importlib_target(cryptnet.spec cryptnet.dll) + add_cd_file(TARGET cryptnet DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/cryptui/CMakeLists.txt b/reactos/dll/win32/cryptui/CMakeLists.txt index 275df359732..bed8af9d445 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) +spec2def(cryptui.dll cryptui.spec ADD_IMPORTLIB) list(APPEND SOURCE main.c @@ -32,5 +32,5 @@ add_importlibs(cryptui kernel32 ntdll) -add_importlib_target(cryptui.spec cryptui.dll) + add_cd_file(TARGET cryptui DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/dbghelp/CMakeLists.txt b/reactos/dll/win32/dbghelp/CMakeLists.txt index b4aa679bd32..f32a2264058 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) +spec2def(dbghelp.dll dbghelp.spec ADD_IMPORTLIB) list(APPEND SOURCE coff.c @@ -51,5 +51,5 @@ target_link_libraries(dbghelp wine ${PSEH_LIB} oldnames) add_delay_importlibs(dbghelp version) add_importlibs(dbghelp psapi msvcrt kernel32 ntdll) add_pch(dbghelp dbghelp_private.h) -add_importlib_target(dbghelp.spec dbghelp.dll) + add_cd_file(TARGET dbghelp DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/devmgr/CMakeLists.txt b/reactos/dll/win32/devmgr/CMakeLists.txt index 23248f61608..0e5b20890b9 100644 --- a/reactos/dll/win32/devmgr/CMakeLists.txt +++ b/reactos/dll/win32/devmgr/CMakeLists.txt @@ -1,7 +1,7 @@ set_rc_compiler() -spec2def(devmgr.dll devmgr.spec) +spec2def(devmgr.dll devmgr.spec ADD_IMPORTLIB) list(APPEND SOURCE devmgr.rc @@ -31,4 +31,4 @@ add_importlibs(devmgr add_pch(devmgr precomp.h) add_cd_file(TARGET devmgr DESTINATION reactos/system32 FOR all) -add_importlib_target(devmgr.spec devmgr.dll) + diff --git a/reactos/dll/win32/dhcpcsvc/CMakeLists.txt b/reactos/dll/win32/dhcpcsvc/CMakeLists.txt index 21a17038616..6aead39e448 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) +spec2def(dhcpcsvc.dll dhcpcsvc.spec ADD_IMPORTLIB) list(APPEND SOURCE dhcp/adapter.c @@ -28,7 +28,7 @@ add_library(dhcpcsvc SHARED ${SOURCE}) set_module_type(dhcpcsvc win32dll) add_importlibs(dhcpcsvc ws2_32 iphlpapi advapi32 msvcrt kernel32 ntdll) -add_importlib_target(dhcpcsvc.spec dhcpcsvc.dll) + add_pch(dhcpcsvc include/rosdhcp.h) diff --git a/reactos/dll/win32/dnsapi/CMakeLists.txt b/reactos/dll/win32/dnsapi/CMakeLists.txt index 3aada06acd3..4e392b0de73 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) +spec2def(dnsapi.dll dnsapi.spec ADD_IMPORTLIB) list(APPEND SOURCE dnsapi/adns.c @@ -27,4 +27,4 @@ add_importlibs(dnsapi user32 ws2_32 iphlpapi msvcrt kernel32 ntdll) add_pch(dnsapi dnsapi/precomp.h) add_dependencies(dnsapi psdk) add_cd_file(TARGET dnsapi DESTINATION reactos/system32 FOR all) -add_importlib_target(dnsapi.spec dnsapi.dll) + diff --git a/reactos/dll/win32/fmifs/CMakeLists.txt b/reactos/dll/win32/fmifs/CMakeLists.txt index c3ce7ec3592..a81ce84d4db 100644 --- a/reactos/dll/win32/fmifs/CMakeLists.txt +++ b/reactos/dll/win32/fmifs/CMakeLists.txt @@ -1,5 +1,5 @@ -spec2def(fmifs.dll fmifs.spec) +spec2def(fmifs.dll fmifs.spec ADD_IMPORTLIB) list(APPEND SOURCE chkdsk.c @@ -20,4 +20,4 @@ add_importlibs(fmifs kernel32 ntdll) add_pch(fmifs precomp.h) add_dependencies(fmifs psdk) add_cd_file(TARGET fmifs DESTINATION reactos/system32 FOR all) -add_importlib_target(fmifs.spec fmifs.dll) + diff --git a/reactos/dll/win32/gdi32/CMakeLists.txt b/reactos/dll/win32/gdi32/CMakeLists.txt index 0166feb3b4f..73268aba47b 100644 --- a/reactos/dll/win32/gdi32/CMakeLists.txt +++ b/reactos/dll/win32/gdi32/CMakeLists.txt @@ -4,7 +4,7 @@ add_definitions(-DLANGPACK) include_directories(include) -spec2def(gdi32.dll gdi32.spec) +spec2def(gdi32.dll gdi32.spec ADD_IMPORTLIB) if(ARCH MATCHES i386) list(APPEND SOURCE @@ -56,4 +56,4 @@ target_link_libraries(gdi32 add_importlibs(gdi32 user32 advapi32 msvcrt kernel32 ntdll) add_pch(gdi32 include/precomp.h) add_cd_file(TARGET gdi32 DESTINATION reactos/system32 FOR all) -add_importlib_target(gdi32.spec gdi32.dll) + diff --git a/reactos/dll/win32/gdiplus/CMakeLists.txt b/reactos/dll/win32/gdiplus/CMakeLists.txt index 6fd174f2e6a..14a47231364 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) +spec2def(gdiplus.dll gdiplus.spec ADD_IMPORTLIB) list(APPEND SOURCE brush.c @@ -49,7 +49,7 @@ add_importlibs(gdiplus kernel32 ntdll) -add_importlib_target(gdiplus.spec gdiplus.dll) + if(ARCH MATCHES amd64) target_link_libraries(gdiplus crt) diff --git a/reactos/dll/win32/getuname/CMakeLists.txt b/reactos/dll/win32/getuname/CMakeLists.txt index cb7185b5929..47423b2dc2c 100644 --- a/reactos/dll/win32/getuname/CMakeLists.txt +++ b/reactos/dll/win32/getuname/CMakeLists.txt @@ -9,7 +9,7 @@ add_library(getuname SHARED getuname.rc ${CMAKE_CURRENT_BINARY_DIR}/getuname.def) -add_importlib_target(getuname.spec getuname.dll) + set_module_type(getuname win32dll UNICODE) add_importlibs(getuname msvcrt kernel32 ntdll) add_cd_file(TARGET getuname DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/glu32/CMakeLists.txt b/reactos/dll/win32/glu32/CMakeLists.txt index 426fde22276..5d377679221 100644 --- a/reactos/dll/win32/glu32/CMakeLists.txt +++ b/reactos/dll/win32/glu32/CMakeLists.txt @@ -16,7 +16,7 @@ include_directories( libtess libutil) -spec2def(glu32.dll glu32.spec) +spec2def(glu32.dll glu32.spec ADD_IMPORTLIB) list(APPEND SOURCE libnurbs/interface/bezierEval.cc @@ -122,4 +122,4 @@ add_importlibs(glu32 ntdll) add_cd_file(TARGET glu32 DESTINATION reactos/system32 FOR all) -add_importlib_target(glu32.spec glu32.dll) + diff --git a/reactos/dll/win32/hlink/CMakeLists.txt b/reactos/dll/win32/hlink/CMakeLists.txt index 4b8d45ec69e..5d1afa92245 100644 --- a/reactos/dll/win32/hlink/CMakeLists.txt +++ b/reactos/dll/win32/hlink/CMakeLists.txt @@ -3,7 +3,7 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) set_rc_compiler() -spec2def(hlink.dll hlink.spec) +spec2def(hlink.dll hlink.spec ADD_IMPORTLIB) list(APPEND SOURCE browse_ctx.c @@ -28,5 +28,5 @@ add_importlibs(hlink ntdll) add_pch(hlink hlink_private.h) -add_importlib_target(hlink.spec hlink.dll) + add_cd_file(TARGET hlink DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/icmp/CMakeLists.txt b/reactos/dll/win32/icmp/CMakeLists.txt index db61216696c..4e0d105171e 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) +spec2def(icmp.dll icmp.spec ADD_IMPORTLIB) list(APPEND SOURCE icmp_main.c @@ -17,5 +17,5 @@ set_module_type(icmp win32dll) target_link_libraries(icmp wine) add_importlibs(icmp ws2_32 msvcrt kernel32 ntdll) -add_importlib_target(icmp.spec icmp.dll) + add_cd_file(TARGET icmp DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/imagehlp/CMakeLists.txt b/reactos/dll/win32/imagehlp/CMakeLists.txt index 9f977d5c00a..8b7b9d1a538 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) +spec2def(imagehlp.dll imagehlp.spec ADD_IMPORTLIB) list(APPEND SOURCE access.c @@ -18,6 +18,6 @@ add_library(imagehlp SHARED ${SOURCE}) set_module_type(imagehlp win32dll) target_link_libraries(imagehlp wine) add_importlibs(imagehlp dbghelp msvcrt kernel32 ntdll) -add_importlib_target(imagehlp.spec imagehlp.dll) + add_pch(imagehlp precomp.h) add_cd_file(TARGET imagehlp DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/imm32/CMakeLists.txt b/reactos/dll/win32/imm32/CMakeLists.txt index c81a64b1bfe..c1aed994a29 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) +spec2def(imm32.dll imm32.spec ADD_IMPORTLIB) list(APPEND SOURCE imm.c @@ -26,4 +26,4 @@ set_module_type(imm32 win32dll) target_link_libraries(imm32 wine) add_importlibs(imm32 advapi32 user32 msvcrt kernel32 ntdll) add_cd_file(TARGET imm32 DESTINATION reactos/system32 FOR all) -add_importlib_target(imm32.spec imm32.dll) + diff --git a/reactos/dll/win32/inetcomm/CMakeLists.txt b/reactos/dll/win32/inetcomm/CMakeLists.txt index 883d7f6a642..5d17403742a 100644 --- a/reactos/dll/win32/inetcomm/CMakeLists.txt +++ b/reactos/dll/win32/inetcomm/CMakeLists.txt @@ -7,7 +7,7 @@ add_definitions(-D_WIN32_WINNT=0x600) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) set_rc_compiler() -spec2def(inetcomm.dll inetcomm.spec) +spec2def(inetcomm.dll inetcomm.spec ADD_IMPORTLIB) list(APPEND SOURCE imaptransport.c @@ -37,5 +37,5 @@ add_importlibs(inetcomm kernel32 ntdll) -add_importlib_target(inetcomm.spec inetcomm.dll) + add_cd_file(TARGET inetcomm DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/iphlpapi/CMakeLists.txt b/reactos/dll/win32/iphlpapi/CMakeLists.txt index 68891751248..589e8502b64 100644 --- a/reactos/dll/win32/iphlpapi/CMakeLists.txt +++ b/reactos/dll/win32/iphlpapi/CMakeLists.txt @@ -5,7 +5,7 @@ include_directories( ${REACTOS_SOURCE_DIR}/dll/win32/dhcpcsvc/include ${REACTOS_SOURCE_DIR}/lib/tdilib) -spec2def(iphlpapi.dll iphlpapi.spec) +spec2def(iphlpapi.dll iphlpapi.spec ADD_IMPORTLIB) list(APPEND SOURCE dhcp_reactos.c @@ -27,4 +27,4 @@ target_link_libraries(iphlpapi wine tdilib) add_importlibs(iphlpapi icmp dhcpcsvc advapi32 ws2_32 msvcrt kernel32 ntdll) add_pch(iphlpapi iphlpapi_private.h) add_cd_file(TARGET iphlpapi DESTINATION reactos/system32 FOR all) -add_importlib_target(iphlpapi.spec iphlpapi.dll) + diff --git a/reactos/dll/win32/kernel32/CMakeLists.txt b/reactos/dll/win32/kernel32/CMakeLists.txt index fb8c390c92f..76632973f9b 100644 --- a/reactos/dll/win32/kernel32/CMakeLists.txt +++ b/reactos/dll/win32/kernel32/CMakeLists.txt @@ -5,7 +5,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys) set_rc_compiler() -spec2def(kernel32.dll kernel32.spec) +spec2def(kernel32.dll kernel32.spec ADD_IMPORTLIB) list(APPEND SOURCE client/appcache.c @@ -99,4 +99,4 @@ add_importlibs(kernel32 ntdll) add_pch(kernel32 k32.h) add_dependencies(kernel32 psdk errcodes asm) add_cd_file(TARGET kernel32 DESTINATION reactos/system32 FOR all) -add_importlib_target(kernel32.spec kernel32.dll) + diff --git a/reactos/dll/win32/loadperf/CMakeLists.txt b/reactos/dll/win32/loadperf/CMakeLists.txt index 53387b64bfc..141a95c6759 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) +spec2def(loadperf.dll loadperf.spec ADD_IMPORTLIB) add_library(loadperf SHARED loadperf_main.c @@ -13,4 +13,4 @@ set_module_type(loadperf win32dll) target_link_libraries(loadperf wine) add_importlibs(loadperf msvcrt kernel32 ntdll) add_cd_file(TARGET loadperf DESTINATION reactos/system32 FOR all) -add_importlib_target(loadperf.spec loadperf.dll) + diff --git a/reactos/dll/win32/localui/CMakeLists.txt b/reactos/dll/win32/localui/CMakeLists.txt index d589333f77d..5aab4d291dd 100644 --- a/reactos/dll/win32/localui/CMakeLists.txt +++ b/reactos/dll/win32/localui/CMakeLists.txt @@ -16,6 +16,6 @@ add_library(localui SHARED ${SOURCE}) set_module_type(localui win32dll) target_link_libraries(localui uuid wine) -add_importlib_target(localui.spec localui.dll) + add_importlibs(localui winspool user32 msvcrt kernel32 ntdll) add_cd_file(TARGET localui DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/lpk/CMakeLists.txt b/reactos/dll/win32/lpk/CMakeLists.txt index dfe5306a7de..fbea9599c1e 100644 --- a/reactos/dll/win32/lpk/CMakeLists.txt +++ b/reactos/dll/win32/lpk/CMakeLists.txt @@ -15,7 +15,7 @@ add_library(lpk SHARED ${SOURCE}) set_module_type(lpk win32dll UNICODE) -add_importlib_target(lpk.spec lpk.dll) + add_importlibs(lpk user32 usp10 msvcrt kernel32 ntdll) add_pch(lpk ros_lpk.h) add_cd_file(TARGET lpk DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/lsasrv/CMakeLists.txt b/reactos/dll/win32/lsasrv/CMakeLists.txt index 8fa08d8e516..aac851095db 100644 --- a/reactos/dll/win32/lsasrv/CMakeLists.txt +++ b/reactos/dll/win32/lsasrv/CMakeLists.txt @@ -8,7 +8,7 @@ add_rpc_files(server ${REACTOS_SOURCE_DIR}/include/reactos/idl/lsa.idl) set_rc_compiler() -spec2def(lsasrv.dll lsasrv.spec) +spec2def(lsasrv.dll lsasrv.spec ADD_IMPORTLIB) list(APPEND SOURCE authport.c @@ -31,4 +31,4 @@ add_importlibs(lsasrv rpcrt4 msvcrt kernel32 ntdll) add_pch(lsasrv lsasrv.h) add_dependencies(lsasrv psdk) add_cd_file(TARGET lsasrv DESTINATION reactos/system32 FOR all) -add_importlib_target(lsasrv.spec lsasrv.dll) + diff --git a/reactos/dll/win32/lz32/CMakeLists.txt b/reactos/dll/win32/lz32/CMakeLists.txt index c9e85369001..8c19456b892 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) +spec2def(lz32.dll lz32.spec ADD_IMPORTLIB) list(APPEND SOURCE version.rc @@ -16,4 +16,4 @@ target_link_libraries(lz32 wine) add_importlibs(lz32 kernel32 ntdll) add_dependencies(lz32 psdk) add_cd_file(TARGET lz32 DESTINATION reactos/system32 FOR all) -add_importlib_target(lz32.spec lz32.dll) + diff --git a/reactos/dll/win32/mlang/CMakeLists.txt b/reactos/dll/win32/mlang/CMakeLists.txt index 167f98fc9ed..5e9bd53e658 100644 --- a/reactos/dll/win32/mlang/CMakeLists.txt +++ b/reactos/dll/win32/mlang/CMakeLists.txt @@ -9,7 +9,7 @@ add_definitions(-D_WIN32_WINNT=0x600) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) set_rc_compiler() -spec2def(mlang.dll mlang.spec) +spec2def(mlang.dll mlang.spec ADD_IMPORTLIB) list(APPEND SOURCE mlang.c @@ -30,6 +30,6 @@ add_importlibs(mlang kernel32 ntdll) -add_importlib_target(mlang.spec mlang.dll) + add_dependencies(mlang psdk) add_cd_file(TARGET mlang DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/mpr/CMakeLists.txt b/reactos/dll/win32/mpr/CMakeLists.txt index 8c0c8fb4adb..575703c06ab 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) +spec2def(mpr.dll mpr.spec ADD_IMPORTLIB) list(APPEND SOURCE auth.c @@ -27,4 +27,4 @@ set_module_type(mpr win32dll) target_link_libraries(mpr wine) add_importlibs(mpr advapi32 user32 msvcrt kernel32 ntdll) add_cd_file(TARGET mpr DESTINATION reactos/system32 FOR all) -add_importlib_target(mpr.spec mpr.dll) + diff --git a/reactos/dll/win32/msacm32/CMakeLists.txt b/reactos/dll/win32/msacm32/CMakeLists.txt index f035fa9fcee..9158bc265ce 100644 --- a/reactos/dll/win32/msacm32/CMakeLists.txt +++ b/reactos/dll/win32/msacm32/CMakeLists.txt @@ -4,7 +4,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) set_rc_compiler() -spec2def(msacm32.dll msacm32.spec) +spec2def(msacm32.dll msacm32.spec ADD_IMPORTLIB) list(APPEND SOURCE driver.c @@ -26,6 +26,6 @@ add_importlibs(msacm32 msvcrt advapi32 user32 winmm kernel32 ntdll) add_dependencies(msacm32 psdk) add_cd_file(TARGET msacm32 DESTINATION reactos/system32 FOR all) -add_importlib_target(msacm32.spec msacm32.dll) + add_subdirectory(msacm32.drv) diff --git a/reactos/dll/win32/msi/CMakeLists.txt b/reactos/dll/win32/msi/CMakeLists.txt index 3b8e7ee1368..486b5462287 100644 --- a/reactos/dll/win32/msi/CMakeLists.txt +++ b/reactos/dll/win32/msi/CMakeLists.txt @@ -8,7 +8,7 @@ remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) set_rc_compiler() -spec2def(msi.dll msi.spec) +spec2def(msi.dll msi.spec ADD_IMPORTLIB) generate_idl_iids(msiserver.idl) @@ -98,4 +98,4 @@ add_cd_file(TARGET msi DESTINATION reactos/system32 FOR all) endif(NOT MSVC) -add_importlib_target(msi.spec msi.dll) + diff --git a/reactos/dll/win32/msimg32/CMakeLists.txt b/reactos/dll/win32/msimg32/CMakeLists.txt index 996715d6d4c..c798a2e4b49 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) +spec2def(msimg32.dll msimg32.spec ADD_IMPORTLIB) list(APPEND SOURCE msimg32_main.c @@ -14,4 +14,4 @@ set_module_type(msimg32 win32dll) target_link_libraries(msimg32 wine) add_importlibs(msimg32 gdi32 msvcrt kernel32 ntdll) add_cd_file(TARGET msimg32 DESTINATION reactos/system32 FOR all) -add_importlib_target(msimg32.spec msimg32.dll) + diff --git a/reactos/dll/win32/msports/CMakeLists.txt b/reactos/dll/win32/msports/CMakeLists.txt index fc4c147c8de..b67cedfe643 100644 --- a/reactos/dll/win32/msports/CMakeLists.txt +++ b/reactos/dll/win32/msports/CMakeLists.txt @@ -17,4 +17,4 @@ target_link_libraries(msports wine) add_importlibs(msports setupapi comctl32 user32 advapi32 msvcrt kernel32 ntdll) add_pch(msports precomp.h) add_cd_file(TARGET msports DESTINATION reactos/system32 FOR all) -add_importlib_target(msports.spec msports.dll) + diff --git a/reactos/dll/win32/msvcrt/CMakeLists.txt b/reactos/dll/win32/msvcrt/CMakeLists.txt index b59cbb85327..209877c8940 100644 --- a/reactos/dll/win32/msvcrt/CMakeLists.txt +++ b/reactos/dll/win32/msvcrt/CMakeLists.txt @@ -1,5 +1,5 @@ -spec2def(msvcrt.dll msvcrt.spec) +spec2def(msvcrt.dll msvcrt.spec ADD_IMPORTLIB) add_definitions( -DUSE_MSVCRT_PREFIX @@ -37,4 +37,4 @@ endif() add_importlibs(msvcrt kernel32 ntdll) add_pch(msvcrt precomp.h) add_cd_file(TARGET msvcrt DESTINATION reactos/system32 FOR all) -add_importlib_target(msvcrt.spec msvcrt.dll) + diff --git a/reactos/dll/win32/msvfw32/CMakeLists.txt b/reactos/dll/win32/msvfw32/CMakeLists.txt index 73e01f8ffbe..17679ebac17 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) +spec2def(msvfw32.dll msvfw32.spec ADD_IMPORTLIB) list(APPEND SOURCE mciwnd.c @@ -24,4 +24,4 @@ target_link_libraries(msvfw32 wine) add_importlibs(msvfw32 winmm version comctl32 user32 gdi32 advapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET msvfw32 DESTINATION reactos/system32 FOR all) -add_importlib_target(msvfw32.spec msvfw32.dll) + diff --git a/reactos/dll/win32/mswsock/CMakeLists.txt b/reactos/dll/win32/mswsock/CMakeLists.txt index 74ea54690ae..72ab98b6a65 100644 --- a/reactos/dll/win32/mswsock/CMakeLists.txt +++ b/reactos/dll/win32/mswsock/CMakeLists.txt @@ -3,7 +3,7 @@ add_definitions(-DLE) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(mswsock.dll mswsock.spec) +spec2def(mswsock.dll mswsock.spec ADD_IMPORTLIB) list(APPEND SOURCE extensions.c @@ -17,4 +17,4 @@ set_module_type(mswsock win32dll UNICODE) add_importlibs(mswsock ws2_32 msvcrt kernel32) add_pch(mswsock precomp.h) add_cd_file(TARGET mswsock DESTINATION reactos/system32 FOR all) -add_importlib_target(mswsock.spec mswsock.dll) + diff --git a/reactos/dll/win32/netapi32/CMakeLists.txt b/reactos/dll/win32/netapi32/CMakeLists.txt index a4f45f0e89d..219f4f9dfed 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) +spec2def(netapi32.dll netapi32.spec ADD_IMPORTLIB) list(APPEND SOURCE access.c @@ -29,4 +29,4 @@ target_link_libraries(netapi32 wine) add_importlibs(netapi32 iphlpapi ws2_32 advapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET netapi32 DESTINATION reactos/system32 FOR all) -add_importlib_target(netapi32.spec netapi32.dll) + diff --git a/reactos/dll/win32/newdev/CMakeLists.txt b/reactos/dll/win32/newdev/CMakeLists.txt index 3ebbcc0eae5..3cea067fb84 100644 --- a/reactos/dll/win32/newdev/CMakeLists.txt +++ b/reactos/dll/win32/newdev/CMakeLists.txt @@ -1,6 +1,6 @@ -spec2def(newdev.dll newdev.spec) +spec2def(newdev.dll newdev.spec ADD_IMPORTLIB) list(APPEND SOURCE newdev.c @@ -16,4 +16,4 @@ target_link_libraries(newdev wine) add_importlibs(newdev gdi32 comctl32 setupapi advapi32 user32 shell32 msvcrt kernel32 ntdll) add_pch(newdev newdev_private.h) add_cd_file(TARGET newdev DESTINATION reactos/system32 FOR all) -add_importlib_target(newdev.spec newdev.dll) + diff --git a/reactos/dll/win32/ntdsapi/CMakeLists.txt b/reactos/dll/win32/ntdsapi/CMakeLists.txt index 5afc0750cb2..b960b23e420 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) +spec2def(ntdsapi.dll ntdsapi.spec ADD_IMPORTLIB) list(APPEND SOURCE ntdsapi.c @@ -15,6 +15,6 @@ set_module_type(ntdsapi win32dll ENTRYPOINT 0 ) target_link_libraries(ntdsapi wine) add_importlibs(ntdsapi user32 kernel32 ntdll) -add_importlib_target(ntdsapi.spec ntdsapi.dll) + add_dependencies(ntdsapi psdk) add_cd_file(TARGET ntdsapi DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/odbccp32/CMakeLists.txt b/reactos/dll/win32/odbccp32/CMakeLists.txt index 5ffff78daac..03e8107212d 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) +spec2def(odbccp32.dll odbccp32.spec ADD_IMPORTLIB) list(APPEND SOURCE odbccp32.c @@ -20,5 +20,5 @@ add_importlibs(odbccp32 kernel32 ntdll) -add_importlib_target(odbccp32.spec odbccp32.dll) + add_cd_file(TARGET odbccp32 DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/ole32/CMakeLists.txt b/reactos/dll/win32/ole32/CMakeLists.txt index 74826202b1d..c19906ba8e8 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) +spec2def(ole32.dll ole32.spec ADD_IMPORTLIB) generate_idl_iids(dcom.idl) add_idl_headers(ole32idl dcom.idl irot.idl) @@ -87,4 +87,4 @@ add_importlibs(ole32 advapi32 user32 gdi32 rpcrt4 msvcrt kernel32 ntdll) add_dependencies(ole32 ole32idl) add_cd_file(TARGET ole32 DESTINATION reactos/system32 FOR all) -add_importlib_target(ole32.spec ole32.dll) + diff --git a/reactos/dll/win32/oleacc/CMakeLists.txt b/reactos/dll/win32/oleacc/CMakeLists.txt index 45afa0cf59c..7551b38c343 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) +spec2def(oleacc.dll oleacc.spec ADD_IMPORTLIB) list(APPEND SOURCE main.c @@ -19,5 +19,5 @@ target_link_libraries(oleacc wine) add_importlibs(oleacc user32 msvcrt kernel32 ntdll) -add_importlib_target(oleacc.spec oleacc.dll) + add_cd_file(TARGET oleacc DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/oleaut32/CMakeLists.txt b/reactos/dll/win32/oleaut32/CMakeLists.txt index 343cc230051..0b9c14af46b 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) +spec2def(oleaut32.dll oleaut32.spec ADD_IMPORTLIB) add_rpcproxy_files(oleaut32_oaidl.idl oleaut32_ocidl.idl) @@ -65,4 +65,4 @@ target_link_libraries(oleaut32 add_delay_importlibs(oleaut32 comctl32 urlmon windowscodecs) add_importlibs(oleaut32 ole32 rpcrt4 user32 gdi32 advapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET oleaut32 DESTINATION reactos/system32 FOR all) -add_importlib_target(oleaut32.spec oleaut32.dll) + diff --git a/reactos/dll/win32/oledlg/CMakeLists.txt b/reactos/dll/win32/oledlg/CMakeLists.txt index e9c57e9647d..7f49ae67514 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) +spec2def(oledlg.dll oledlg.spec ADD_IMPORTLIB) list(APPEND SOURCE insobjdlg.c @@ -16,5 +16,5 @@ add_library(oledlg SHARED ${SOURCE}) set_module_type(oledlg win32dll) target_link_libraries(oledlg wine) add_importlibs(oledlg ole32 comdlg32 user32 advapi32 msvcrt kernel32 ntdll) -add_importlib_target(oledlg.spec oledlg.dll) + add_cd_file(TARGET oledlg DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/opengl32/CMakeLists.txt b/reactos/dll/win32/opengl32/CMakeLists.txt index e243802e026..280195377fa 100644 --- a/reactos/dll/win32/opengl32/CMakeLists.txt +++ b/reactos/dll/win32/opengl32/CMakeLists.txt @@ -1,6 +1,6 @@ -spec2def(opengl32.dll opengl32.spec) +spec2def(opengl32.dll opengl32.spec ADD_IMPORTLIB) list(APPEND SOURCE font.c @@ -26,4 +26,4 @@ add_importlibs(opengl32 add_pch(opengl32 opengl32.h) add_cd_file(TARGET opengl32 DESTINATION reactos/system32 FOR all) -add_importlib_target(opengl32.spec opengl32.dll) + diff --git a/reactos/dll/win32/pdh/CMakeLists.txt b/reactos/dll/win32/pdh/CMakeLists.txt index 98c7870b0fb..5bfeb1e5544 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) +spec2def(pdh.dll pdh.spec ADD_IMPORTLIB) list(APPEND SOURCE pdh_main.c @@ -19,6 +19,6 @@ set_module_type(pdh win32dll ENTRYPOINT 0 ) target_link_libraries(pdh wine) add_importlibs(pdh kernel32 ntdll msvcrt) -add_importlib_target(pdh.spec pdh.dll) + add_cd_file(TARGET pdh DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/powrprof/CMakeLists.txt b/reactos/dll/win32/powrprof/CMakeLists.txt index e75758f1737..cca66c17a6b 100644 --- a/reactos/dll/win32/powrprof/CMakeLists.txt +++ b/reactos/dll/win32/powrprof/CMakeLists.txt @@ -1,5 +1,5 @@ -spec2def(powrprof.dll powrprof.spec) +spec2def(powrprof.dll powrprof.spec ADD_IMPORTLIB) add_library(powrprof SHARED @@ -12,5 +12,5 @@ set_module_type(powrprof win32dll UNICODE) target_link_libraries(powrprof wine) add_importlibs(powrprof advapi32 user32 comctl32 msvcrt kernel32 ntdll) -add_importlib_target(powrprof.spec powrprof.dll) + add_cd_file(TARGET powrprof DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/psapi/CMakeLists.txt b/reactos/dll/win32/psapi/CMakeLists.txt index 0549ccf0f3b..5787852027d 100644 --- a/reactos/dll/win32/psapi/CMakeLists.txt +++ b/reactos/dll/win32/psapi/CMakeLists.txt @@ -1,5 +1,5 @@ -spec2def(psapi.dll psapi.spec) +spec2def(psapi.dll psapi.spec ADD_IMPORTLIB) list(APPEND SOURCE malloc.c @@ -12,6 +12,6 @@ add_library(psapi SHARED ${SOURCE}) set_module_type(psapi win32dll) target_link_libraries(psapi epsapi ${PSEH_LIB}) add_importlibs(psapi msvcrt kernel32 ntdll) -add_importlib_target(psapi.spec psapi.dll) + add_pch(psapi precomp.h) add_cd_file(TARGET psapi DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/rasapi32/CMakeLists.txt b/reactos/dll/win32/rasapi32/CMakeLists.txt index 120748adb17..6919610918a 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) +spec2def(rasapi32.dll rasapi32.spec ADD_IMPORTLIB) list(APPEND SOURCE rasapi.c @@ -16,6 +16,6 @@ set_module_type(rasapi32 win32dll ENTRYPOINT 0 ) target_link_libraries(rasapi32 wine) add_importlibs(rasapi32 kernel32 ntdll) -add_importlib_target(rasapi32.spec rasapi32.dll) + add_dependencies(rasapi32 psdk) add_cd_file(TARGET rasapi32 DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/riched20/CMakeLists.txt b/reactos/dll/win32/riched20/CMakeLists.txt index 9390711c107..2e69f870cda 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) +spec2def(riched20.dll riched20.spec ADD_IMPORTLIB) set_rc_compiler() @@ -51,5 +51,5 @@ add_importlibs(riched20 ntdll) add_pch(riched20 editor.h) -add_importlib_target(riched20.spec riched20.dll) + add_cd_file(TARGET riched20 DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/rpcrt4/CMakeLists.txt b/reactos/dll/win32/rpcrt4/CMakeLists.txt index a4f48a0056a..92f0c5eeeee 100644 --- a/reactos/dll/win32/rpcrt4/CMakeLists.txt +++ b/reactos/dll/win32/rpcrt4/CMakeLists.txt @@ -1,4 +1,6 @@ +spec2def(rpcrt4.dll rpcrt4.spec ADD_IMPORTLIB) + add_rpc_files(client epm.idl) list(APPEND SOURCE @@ -40,8 +42,6 @@ add_definitions( include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(rpcrt4.dll rpcrt4.spec) - add_library(rpcrt4 SHARED ${SOURCE}) set_module_type(rpcrt4 win32dll) target_link_libraries(rpcrt4 wine uuid ${PSEH_LIB}) @@ -49,7 +49,7 @@ target_link_libraries(rpcrt4 wine uuid ${PSEH_LIB}) add_delay_importlibs(rpcrt4 iphlpapi wininet secur32 user32) add_importlibs(rpcrt4 msvcrt advapi32 ws2_32 kernel32 ntdll) add_cd_file(TARGET rpcrt4 DESTINATION reactos/system32 FOR all) -add_importlib_target(rpcrt4.spec rpcrt4.dll) + if(NOT MSVC) allow_warnings(rpcrt4) diff --git a/reactos/dll/win32/rsaenh/CMakeLists.txt b/reactos/dll/win32/rsaenh/CMakeLists.txt index 3d95a4fc8bf..913693c896b 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) +spec2def(rsaenh.dll rsaenh.spec ADD_IMPORTLIB) list(APPEND SOURCE aes.c @@ -25,5 +25,5 @@ set_module_type(rsaenh win32dll) target_link_libraries(rsaenh wine) add_importlibs(rsaenh msvcrt crypt32 advapi32 kernel32 ntdll) add_pch(rsaenh tomcrypt.h) -add_importlib_target(rsaenh.spec rsaenh.dll) + add_cd_file(TARGET rsaenh DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/samlib/CMakeLists.txt b/reactos/dll/win32/samlib/CMakeLists.txt index f511b7e7572..fb947aca696 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) +spec2def(samlib.dll samlib.spec ADD_IMPORTLIB) list(APPEND SOURCE dllmain.c @@ -17,4 +17,4 @@ set_module_type(samlib win32dll) add_importlibs(samlib advapi32 msvcrt kernel32 ntdll) add_pch(samlib precomp.h) add_cd_file(TARGET samlib DESTINATION reactos/system32 FOR all) -add_importlib_target(samlib.spec samlib.dll) + diff --git a/reactos/dll/win32/secur32/CMakeLists.txt b/reactos/dll/win32/secur32/CMakeLists.txt index 2efb95d6ac5..a3ffb431a45 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) +spec2def(secur32.dll secur32.spec ADD_IMPORTLIB) list(APPEND SOURCE dllmain.c @@ -24,4 +24,4 @@ add_importlibs(secur32 advapi32 msvcrt kernel32 ntdll) add_pch(secur32 precomp.h) add_cd_file(TARGET secur32 DESTINATION reactos/system32 FOR all) -add_importlib_target(secur32.spec secur32.dll) + diff --git a/reactos/dll/win32/sensapi/CMakeLists.txt b/reactos/dll/win32/sensapi/CMakeLists.txt index 26181ca279c..70e9a32dfa4 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) +spec2def(sensapi.dll sensapi.spec ADD_IMPORTLIB) list(APPEND SOURCE sensapi.c @@ -13,5 +13,5 @@ add_library(sensapi SHARED ${SOURCE}) set_module_type(sensapi win32dll) target_link_libraries(sensapi wine) add_importlibs(sensapi msvcrt kernel32 ntdll) -add_importlib_target(sensapi.spec sensapi.dll) + add_cd_file(TARGET sensapi DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/setupapi/CMakeLists.txt b/reactos/dll/win32/setupapi/CMakeLists.txt index e8f7649bda0..892a4ac1f64 100644 --- a/reactos/dll/win32/setupapi/CMakeLists.txt +++ b/reactos/dll/win32/setupapi/CMakeLists.txt @@ -13,7 +13,7 @@ add_rpc_files(client ${REACTOS_SOURCE_DIR}/include/reactos/idl/pnp.idl) set_rc_compiler() -spec2def(setupapi.dll setupapi.spec) +spec2def(setupapi.dll setupapi.spec ADD_IMPORTLIB) list(APPEND SOURCE cfgmgr.c @@ -55,4 +55,4 @@ add_importlibs(setupapi add_pch(setupapi setupapi_private.h) add_cd_file(TARGET setupapi DESTINATION reactos/system32 FOR all) -add_importlib_target(setupapi.spec setupapi.dll) + diff --git a/reactos/dll/win32/sfc_os/CMakeLists.txt b/reactos/dll/win32/sfc_os/CMakeLists.txt index 486c2b0d79f..ff68839a2c9 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) +spec2def(sfc_os.dll sfc_os.spec ADD_IMPORTLIB) list(APPEND SOURCE sfc_os.c @@ -10,6 +10,6 @@ add_library(sfc_os SHARED ${SOURCE}) set_module_type(sfc_os win32dll) add_importlibs(sfc_os msvcrt kernel32 ntdll) -add_importlib_target(sfc_os.spec sfc_os.dll) + add_pch(sfc_os precomp.h) add_cd_file(TARGET sfc_os DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/shdocvw/CMakeLists.txt b/reactos/dll/win32/shdocvw/CMakeLists.txt index 2a1a0888150..655e2bda3af 100644 --- a/reactos/dll/win32/shdocvw/CMakeLists.txt +++ b/reactos/dll/win32/shdocvw/CMakeLists.txt @@ -6,7 +6,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) set_rc_compiler() -spec2def(shdocvw.dll shdocvw.spec) +spec2def(shdocvw.dll shdocvw.spec ADD_IMPORTLIB) list(APPEND SOURCE classinfo.c @@ -55,7 +55,7 @@ add_dependencies(shdocvw stdole2) add_pch(shdocvw shdocvw.h) add_cd_file(TARGET shdocvw DESTINATION reactos/system32 FOR all) -add_importlib_target(shdocvw.spec shdocvw.dll) + if(NOT MSVC) allow_warnings(shdocvw) diff --git a/reactos/dll/win32/shell32/CMakeLists.txt b/reactos/dll/win32/shell32/CMakeLists.txt index 26039c450e1..ef72926ae6b 100644 --- a/reactos/dll/win32/shell32/CMakeLists.txt +++ b/reactos/dll/win32/shell32/CMakeLists.txt @@ -14,7 +14,7 @@ include_directories( ${REACTOS_SOURCE_DIR}/lib/atl ${REACTOS_SOURCE_DIR}) -spec2def(shell32.dll shell32.spec) +spec2def(shell32.dll shell32.spec ADD_IMPORTLIB) list(APPEND SOURCE authors.cpp @@ -107,4 +107,4 @@ add_dependencies(shdocvw shdocvw_v1) add_pch(shell32 precomp.h) add_cd_file(TARGET shell32 DESTINATION reactos/system32 FOR all) -add_importlib_target(shell32.spec shell32.dll) + diff --git a/reactos/dll/win32/shlwapi/CMakeLists.txt b/reactos/dll/win32/shlwapi/CMakeLists.txt index aa57a47b454..80a8d03dbb5 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) +spec2def(shlwapi.dll shlwapi.spec ADD_IMPORTLIB) list(APPEND SOURCE assoc.c @@ -32,4 +32,4 @@ target_link_libraries(shlwapi wine uuid) add_delay_importlibs(shlwapi userenv oleaut32 ole32 comctl32 comdlg32 mpr mlang urlmon shell32 winmm version) add_importlibs(shlwapi user32 gdi32 advapi32 msvcrt wininet kernel32 ntdll) add_cd_file(TARGET shlwapi DESTINATION reactos/system32 FOR all) -add_importlib_target(shlwapi.spec shlwapi.dll) + diff --git a/reactos/dll/win32/smdll/CMakeLists.txt b/reactos/dll/win32/smdll/CMakeLists.txt index fb3aeca4578..88e87e35b28 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) +spec2def(smdll.dll smdll.spec ADD_IMPORTLIB) list(APPEND SOURCE dllmain.c @@ -17,4 +17,4 @@ add_importlibs(smdll ntdll) add_pch(smdll precomp.h) add_dependencies(smdll psdk) add_cd_file(TARGET smdll DESTINATION reactos/system32 FOR all) -add_importlib_target(smdll.spec smdll.dll) + diff --git a/reactos/dll/win32/snmpapi/CMakeLists.txt b/reactos/dll/win32/snmpapi/CMakeLists.txt index c5c88235d28..07278926b75 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) +spec2def(snmpapi.dll snmpapi.spec ADD_IMPORTLIB) list(APPEND SOURCE main.c @@ -23,4 +23,4 @@ target_link_libraries(snmpapi wine) add_importlibs(snmpapi msvcrt kernel32 ntdll) add_cd_file(TARGET snmpapi DESTINATION reactos/system32 FOR all) -add_importlib_target(snmpapi.spec snmpapi.dll) + diff --git a/reactos/dll/win32/spoolss/CMakeLists.txt b/reactos/dll/win32/spoolss/CMakeLists.txt index 1f6317b7351..ead52469017 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) +spec2def(spoolss.dll spoolss.spec ADD_IMPORTLIB) list(APPEND SOURCE spoolss_main.c @@ -15,5 +15,5 @@ allow_warnings(spoolss) set_module_type(spoolss win32dll) target_link_libraries(spoolss wine) add_importlibs(spoolss winspool msvcrt kernel32 ntdll) -add_importlib_target(spoolss.spec spoolss.dll) + add_cd_file(TARGET spoolss DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/ufatx/CMakeLists.txt b/reactos/dll/win32/ufatx/CMakeLists.txt index 3298fde7956..73d77f404cd 100644 --- a/reactos/dll/win32/ufatx/CMakeLists.txt +++ b/reactos/dll/win32/ufatx/CMakeLists.txt @@ -11,6 +11,6 @@ set_module_type(ufatx win32dll ENTRYPOINT 0 ) target_link_libraries(ufatx vfatxlib) add_importlibs(ufatx ntdll) -add_importlib_target(ufatx.spec ufatx.dll) + add_dependencies(ufatx psdk) add_cd_file(TARGET ufatx DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/urlmon/CMakeLists.txt b/reactos/dll/win32/urlmon/CMakeLists.txt index 6bbffb341f1..b010e3fa137 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) +spec2def(urlmon.dll urlmon.spec ADD_IMPORTLIB) add_rpcproxy_files(urlmon_urlmon.idl) @@ -73,4 +73,4 @@ add_definitions( add_pch(urlmon urlmon_main.h) add_definitions(-DPROXY_CLSID_IS="{0x79EAC9F1,0xBAF9,0x11CE,{0x8C,0x82,0x00,0xAA,0x00,0x4B,0xA9,0x0B}}") add_cd_file(TARGET urlmon DESTINATION reactos/system32 FOR all) -add_importlib_target(urlmon.spec urlmon.dll) + diff --git a/reactos/dll/win32/user32/CMakeLists.txt b/reactos/dll/win32/user32/CMakeLists.txt index c154b9e0c53..cdbe4fe4e43 100644 --- a/reactos/dll/win32/user32/CMakeLists.txt +++ b/reactos/dll/win32/user32/CMakeLists.txt @@ -1,5 +1,5 @@ -spec2def(user32.dll user32.spec) +spec2def(user32.dll user32.spec ADD_IMPORTLIB) include_directories( BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine @@ -76,4 +76,4 @@ add_delay_importlibs(user32 imm32 usp10) add_importlibs(user32 gdi32 advapi32 msvcrt kernel32 ntdll) add_pch(user32 include/user32.h) add_cd_file(TARGET user32 DESTINATION reactos/system32 FOR all) -add_importlib_target(user32.spec user32.dll) + diff --git a/reactos/dll/win32/userenv/CMakeLists.txt b/reactos/dll/win32/userenv/CMakeLists.txt index d7865f1cd3e..7d7cd170cef 100644 --- a/reactos/dll/win32/userenv/CMakeLists.txt +++ b/reactos/dll/win32/userenv/CMakeLists.txt @@ -1,5 +1,5 @@ -spec2def(userenv.dll userenv.spec) +spec2def(userenv.dll userenv.spec ADD_IMPORTLIB) set_rc_compiler() @@ -27,4 +27,4 @@ add_importlibs(userenv advapi32 user32 msvcrt kernel32 ntdll) add_pch(userenv precomp.h) add_cd_file(TARGET userenv DESTINATION reactos/system32 FOR all) -add_importlib_target(userenv.spec userenv.dll) + diff --git a/reactos/dll/win32/usp10/CMakeLists.txt b/reactos/dll/win32/usp10/CMakeLists.txt index d8ef8cb93ea..3403d57e9fa 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) +spec2def(usp10.dll usp10.spec ADD_IMPORTLIB) list(APPEND SOURCE bidi.c @@ -25,6 +25,6 @@ set_module_type(usp10 win32dll) target_link_libraries(usp10 wine) add_importlibs(usp10 advapi32 user32 gdi32 msvcrt kernel32 ntdll) -add_importlib_target(usp10.spec usp10.dll) + add_cd_file(TARGET usp10 DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/uxtheme/CMakeLists.txt b/reactos/dll/win32/uxtheme/CMakeLists.txt index 7a231840f89..818ceed3ad8 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) +spec2def(uxtheme.dll uxtheme.spec ADD_IMPORTLIB) list(APPEND SOURCE buffer.c @@ -29,4 +29,4 @@ add_delay_importlibs(uxtheme msimg32) add_importlibs(uxtheme user32 advapi32 gdi32 msvcrt kernel32 ntdll) add_pch(uxtheme uxthemep.h) add_cd_file(TARGET uxtheme DESTINATION reactos/system32 FOR all) -add_importlib_target(uxtheme.spec uxtheme.dll) + diff --git a/reactos/dll/win32/version/CMakeLists.txt b/reactos/dll/win32/version/CMakeLists.txt index 29dcb00ced1..4365f765671 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) +spec2def(version.dll version.spec ADD_IMPORTLIB) list(APPEND SOURCE info.c @@ -19,4 +19,4 @@ target_link_libraries(version wine) add_importlibs(version lz32 kernel32 ntdll) add_dependencies(version psdk) add_cd_file(TARGET version DESTINATION reactos/system32 FOR all) -add_importlib_target(version.spec version.dll) + diff --git a/reactos/dll/win32/windowscodecs/CMakeLists.txt b/reactos/dll/win32/windowscodecs/CMakeLists.txt index ff7eaac60c2..f8b14c543f3 100644 --- a/reactos/dll/win32/windowscodecs/CMakeLists.txt +++ b/reactos/dll/win32/windowscodecs/CMakeLists.txt @@ -16,7 +16,7 @@ if(MSVC) add_compile_flags("/FItypeof.h") endif() -spec2def(windowscodecs.dll windowscodecs.spec) +spec2def(windowscodecs.dll windowscodecs.spec ADD_IMPORTLIB) list(APPEND SOURCE bmpdecode.c @@ -54,6 +54,6 @@ set_module_type(windowscodecs win32dll) target_link_libraries(windowscodecs wine uuid) add_importlibs(windowscodecs ole32 shlwapi advapi32 msvcrt kernel32 ntdll) -add_importlib_target(windowscodecs.spec windowscodecs.dll) + add_cd_file(TARGET windowscodecs DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/winhttp/CMakeLists.txt b/reactos/dll/win32/winhttp/CMakeLists.txt index da5bb6d26b0..7d1b7db0742 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) +spec2def(winhttp.dll winhttp.spec ADD_IMPORTLIB) list(APPEND SOURCE cookie.c @@ -20,7 +20,7 @@ set_module_type(winhttp win32dll) target_link_libraries(winhttp wine) add_delay_importlibs(winhttp crypt32) add_importlibs(winhttp shlwapi wininet ws2_32 msvcrt advapi32 kernel32 ntdll) -add_importlib_target(winhttp.spec winhttp.dll) + add_cd_file(TARGET winhttp DESTINATION reactos/system32 FOR all) if(NOT MSVC) diff --git a/reactos/dll/win32/wininet/CMakeLists.txt b/reactos/dll/win32/wininet/CMakeLists.txt index dc9301c233d..f6f49307103 100644 --- a/reactos/dll/win32/wininet/CMakeLists.txt +++ b/reactos/dll/win32/wininet/CMakeLists.txt @@ -7,7 +7,7 @@ add_definitions( include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/zlib) -spec2def(wininet.dll wininet.spec) +spec2def(wininet.dll wininet.spec ADD_IMPORTLIB) set_rc_compiler() @@ -34,7 +34,7 @@ target_link_libraries(wininet wine ${PSEH_LIB} zlib) add_delay_importlibs(wininet secur32 crypt32) add_importlibs(wininet mpr shlwapi shell32 user32 advapi32 ws2_32 msvcrt kernel32 ntdll) add_cd_file(TARGET wininet DESTINATION reactos/system32 FOR all) -add_importlib_target(wininet.spec wininet.dll) + if(NOT MSVC) allow_warnings(wininet) diff --git a/reactos/dll/win32/winmm/CMakeLists.txt b/reactos/dll/win32/winmm/CMakeLists.txt index f6f19c001d7..9e8cb2c2b05 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) +spec2def(winmm.dll winmm.spec ADD_IMPORTLIB) set_rc_compiler() @@ -29,4 +29,4 @@ add_importlibs(winmm advapi32 user32 msvcrt kernel32 ntdll) add_subdirectory(midimap) add_cd_file(TARGET winmm DESTINATION reactos/system32 FOR all) -add_importlib_target(winmm.spec winmm.dll) + diff --git a/reactos/dll/win32/winspool/CMakeLists.txt b/reactos/dll/win32/winspool/CMakeLists.txt index ae413a9df72..ccde1a6454b 100644 --- a/reactos/dll/win32/winspool/CMakeLists.txt +++ b/reactos/dll/win32/winspool/CMakeLists.txt @@ -4,7 +4,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) set_rc_compiler() -spec2def(winspool.drv winspool.spec) +spec2def(winspool.drv winspool.spec ADD_IMPORTLIB) list(APPEND SOURCE info.c @@ -21,4 +21,4 @@ set_module_type(winspool.drv win32dll UNICODE) target_link_libraries(winspool.drv wine) add_importlibs(winspool.drv advapi32 shlwapi msvcrt kernel32 ntdll) add_cd_file(TARGET winspool.drv DESTINATION reactos/system32 FOR all) -add_importlib_target(winspool.spec winspool.drv) + diff --git a/reactos/dll/win32/wintrust/CMakeLists.txt b/reactos/dll/win32/wintrust/CMakeLists.txt index 7276f43ea64..9bb067775ef 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) +spec2def(wintrust.dll wintrust.spec ADD_IMPORTLIB) list(APPEND SOURCE crypt.c @@ -20,5 +20,5 @@ set_module_type(wintrust win32dll) target_link_libraries(wintrust wine ${PSEH_LIB}) add_delay_importlibs(wintrust cryptui imagehlp) add_importlibs(wintrust crypt32 user32 advapi32 msvcrt kernel32 ntdll) -add_importlib_target(wintrust.spec wintrust.dll) + add_cd_file(TARGET wintrust DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/wlanapi/CMakeLists.txt b/reactos/dll/win32/wlanapi/CMakeLists.txt index ca305153197..d273c57635d 100644 --- a/reactos/dll/win32/wlanapi/CMakeLists.txt +++ b/reactos/dll/win32/wlanapi/CMakeLists.txt @@ -3,7 +3,7 @@ include_directories( ${REACTOS_SOURCE_DIR}/include/reactos/idl) add_rpc_files(client ${REACTOS_SOURCE_DIR}/include/reactos/idl/wlansvc.idl) -spec2def(wlanapi.dll wlanapi.spec) +spec2def(wlanapi.dll wlanapi.spec ADD_IMPORTLIB) list(APPEND SOURCE main.c @@ -20,7 +20,7 @@ target_link_libraries(wlanapi ${PSEH_LIB}) add_importlibs(wlanapi rpcrt4 msvcrt kernel32 ntdll) -add_importlib_target(wlanapi.spec wlanapi.dll) + add_dependencies(wlanapi psdk) add_cd_file(TARGET wlanapi DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/wldap32/CMakeLists.txt b/reactos/dll/win32/wldap32/CMakeLists.txt index ac6fff2023e..fe41ad675d3 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) +spec2def(wldap32.dll wldap32.spec ADD_IMPORTLIB) list(APPEND SOURCE add.c @@ -37,5 +37,5 @@ set_module_type(wldap32 win32dll) target_link_libraries(wldap32 wine) add_importlibs(wldap32 user32 msvcrt kernel32 ntdll) -add_importlib_target(wldap32.spec wldap32.dll) + add_cd_file(TARGET wldap32 DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/ws2_32/CMakeLists.txt b/reactos/dll/win32/ws2_32/CMakeLists.txt index a98b6b6e34b..348973f3b62 100644 --- a/reactos/dll/win32/ws2_32/CMakeLists.txt +++ b/reactos/dll/win32/ws2_32/CMakeLists.txt @@ -5,7 +5,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) +spec2def(ws2_32.dll ws2_32.spec ADD_IMPORTLIB) list(APPEND SOURCE misc/bsd.c @@ -28,4 +28,4 @@ add_delay_importlibs(ws2_32 user32) add_importlibs(ws2_32 advapi32 dnsapi ws2help msvcrt kernel32 ntdll) add_pch(ws2_32 include/ws2_32.h) add_cd_file(TARGET ws2_32 DESTINATION reactos/system32 FOR all) -add_importlib_target(ws2_32.spec ws2_32.dll) + diff --git a/reactos/dll/win32/ws2_32_new/CMakeLists.txt b/reactos/dll/win32/ws2_32_new/CMakeLists.txt index e8634301f58..98722c8565c 100644 --- a/reactos/dll/win32/ws2_32_new/CMakeLists.txt +++ b/reactos/dll/win32/ws2_32_new/CMakeLists.txt @@ -45,7 +45,7 @@ list(APPEND SOURCE src/startup.c src/wsautil.c ws2_32.rc - ${CMAKE_CURRENT_BINARY_DIR}/ws2_32.def) + ${CMAKE_CURRENT_BINARY_DIR}/ws2_32_new.def) add_library(ws2_32_new SHARED ${SOURCE}) set_module_type(ws2_32_new win32dll) diff --git a/reactos/dll/win32/ws2help/CMakeLists.txt b/reactos/dll/win32/ws2help/CMakeLists.txt index ed63ed67f3b..7aaf6508623 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) +spec2def(ws2help.dll ws2help.spec ADD_IMPORTLIB) list(APPEND SOURCE apc.c @@ -16,4 +16,4 @@ set_module_type(ws2help win32dll) add_importlibs(ws2help advapi32 ws2_32 msvcrt kernel32 ntdll) add_pch(ws2help precomp.h) add_cd_file(TARGET ws2help DESTINATION reactos/system32 FOR all) -add_importlib_target(ws2help.spec ws2help.dll) + diff --git a/reactos/dll/win32/xinput1_3/CMakeLists.txt b/reactos/dll/win32/xinput1_3/CMakeLists.txt index 383f30c6791..cf8ca96385d 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) +spec2def(xinput1_3.dll xinput1_3.spec ADD_IMPORTLIB) list(APPEND SOURCE xinput1_3_main.c @@ -11,7 +11,7 @@ list(APPEND SOURCE add_library(xinput1_3 SHARED ${SOURCE}) -add_importlib_target(xinput1_3.spec xinput1_3.dll) + set_module_type(xinput1_3 win32dll) target_link_libraries(xinput1_3 wine) add_importlibs(xinput1_3 msvcrt kernel32 ntdll) diff --git a/reactos/dll/win32/xmllite/CMakeLists.txt b/reactos/dll/win32/xmllite/CMakeLists.txt index 0232c474d9d..b3dc0fbfbf4 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) +spec2def(xmllite.dll xmllite.spec ADD_IMPORTLIB) list(APPEND SOURCE reader.c @@ -18,5 +18,5 @@ set_module_type(xmllite win32dll) target_link_libraries(xmllite wine uuid) add_importlibs(xmllite msvcrt kernel32 ntdll) -add_importlib_target(xmllite.spec xmllite.dll) + add_cd_file(TARGET xmllite DESTINATION reactos/system32 FOR all) diff --git a/reactos/drivers/base/bootvid/CMakeLists.txt b/reactos/drivers/base/bootvid/CMakeLists.txt index 6a8da3b0c4e..18cdcb87472 100644 --- a/reactos/drivers/base/bootvid/CMakeLists.txt +++ b/reactos/drivers/base/bootvid/CMakeLists.txt @@ -1,5 +1,5 @@ -spec2def(bootvid.dll bootvid.spec) +spec2def(bootvid.dll bootvid.spec ADD_IMPORTLIB) list(APPEND SOURCE bootvid.rc @@ -26,4 +26,4 @@ add_importlibs(bootvid ntoskrnl hal) add_pch(bootvid precomp.h) add_dependencies(bootvid psdk bugcodes) add_cd_file(TARGET bootvid DESTINATION reactos/system32 NO_CAB FOR all) -add_importlib_target(bootvid.spec bootvid.dll) + diff --git a/reactos/drivers/base/kdcom/CMakeLists.txt b/reactos/drivers/base/kdcom/CMakeLists.txt index c8125771a4d..691ffa36c4a 100644 --- a/reactos/drivers/base/kdcom/CMakeLists.txt +++ b/reactos/drivers/base/kdcom/CMakeLists.txt @@ -1,5 +1,5 @@ -spec2def(kdcom.dll kdcom.spec) +spec2def(kdcom.dll kdcom.spec ADD_IMPORTLIB) if(ARCH MATCHES i386) list(APPEND SOURCE i386/kdbg.c) @@ -20,4 +20,4 @@ add_importlibs(kdcom ntoskrnl hal) add_dependencies(kdcom psdk bugcodes) add_cd_file(TARGET kdcom DESTINATION reactos/system32 NO_CAB FOR all) -add_importlib_target(kdcom.spec kdcom.dll) + diff --git a/reactos/drivers/base/kddll/CMakeLists.txt b/reactos/drivers/base/kddll/CMakeLists.txt index b720b9c7e15..4d3473b98d7 100644 --- a/reactos/drivers/base/kddll/CMakeLists.txt +++ b/reactos/drivers/base/kddll/CMakeLists.txt @@ -1,5 +1,5 @@ -spec2def(kdcom.dll kdcom.spec) +spec2def(kdcom.dll kdcom.spec ADD_IMPORTLIB) add_library(kdcom SHARED kdcom.c @@ -12,5 +12,5 @@ set_subsystem(kdcom native) set_image_base(kdcom 0x00010000) add_importlibs(kdcom ntoskrnl hal) add_dependencies(kdcom psdk bugcodes) -add_importlib_target(kdcom.spec kdcom.dll) + add_cd_file(TARGET kdcom DESTINATION reactos/system32 NO_CAB FOR all) diff --git a/reactos/drivers/battery/battc/CMakeLists.txt b/reactos/drivers/battery/battc/CMakeLists.txt index 8bd2ac7f760..a0bea76b4d4 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) +spec2def(battc.sys battc.spec ADD_IMPORTLIB) add_library(battc SHARED battc.c @@ -12,4 +12,4 @@ set_module_type(battc kernelmodedriver) add_importlibs(battc ntoskrnl hal) add_cd_file(TARGET battc DESTINATION reactos/system32/drivers FOR all) -add_importlib_target(battc.spec battc.sys) + diff --git a/reactos/drivers/directx/dxgthk/CMakeLists.txt b/reactos/drivers/directx/dxgthk/CMakeLists.txt index 26bec98022e..65435843a2c 100644 --- a/reactos/drivers/directx/dxgthk/CMakeLists.txt +++ b/reactos/drivers/directx/dxgthk/CMakeLists.txt @@ -1,5 +1,5 @@ -spec2def(dxgthk.sys dxgthk.spec) +spec2def(dxgthk.sys dxgthk.spec ADD_IMPORTLIB) list(APPEND SOURCE main.c @@ -11,6 +11,6 @@ add_library(dxgthk SHARED ${SOURCE}) set_module_type(dxgthk kernelmodedriver) add_importlibs(dxgthk win32k) -add_importlib_target(dxgthk.spec dxgthk.sys) + add_cd_file(TARGET dxgthk DESTINATION reactos/system32/drivers FOR all) diff --git a/reactos/drivers/hid/hidclass/CMakeLists.txt b/reactos/drivers/hid/hidclass/CMakeLists.txt index 0178e854333..b75f09a94f6 100644 --- a/reactos/drivers/hid/hidclass/CMakeLists.txt +++ b/reactos/drivers/hid/hidclass/CMakeLists.txt @@ -1,5 +1,5 @@ -spec2def(hidclass.sys hidclass.spec) +spec2def(hidclass.sys hidclass.spec ADD_IMPORTLIB) list(APPEND SOURCE fdo.c @@ -16,6 +16,6 @@ set_target_properties(hidclass PROPERTIES SUFFIX ".sys") add_importlibs(hidclass ntoskrnl hidparse hal) -add_importlib_target(hidclass.spec hidclass.sys) + add_cd_file(TARGET hidclass DESTINATION reactos/system32/drivers NO_CAB FOR all) \ No newline at end of file diff --git a/reactos/drivers/hid/hidparse/CMakeLists.txt b/reactos/drivers/hid/hidparse/CMakeLists.txt index 5c1ae6601f0..f8e78eb1888 100644 --- a/reactos/drivers/hid/hidparse/CMakeLists.txt +++ b/reactos/drivers/hid/hidparse/CMakeLists.txt @@ -1,5 +1,5 @@ -spec2def(hidparse.sys hidparse.spec) +spec2def(hidparse.sys hidparse.spec ADD_IMPORTLIB) add_definitions(-DDEBUG_MODE) include_directories( @@ -11,7 +11,6 @@ add_library(hidparse SHARED hidparse.c hidparse.rc ${CMAKE_CURRENT_BINARY_DIR}/h set_module_type(hidparse kernelmodedriver) add_importlibs(hidparse ntoskrnl) -add_importlib_target(hidparse.spec hidparse.sys) target_link_libraries(hidparse hidparser) diff --git a/reactos/drivers/ksfilter/ks/CMakeLists.txt b/reactos/drivers/ksfilter/ks/CMakeLists.txt index 27b21c0d99f..fdd2fa40d27 100644 --- a/reactos/drivers/ksfilter/ks/CMakeLists.txt +++ b/reactos/drivers/ksfilter/ks/CMakeLists.txt @@ -1,5 +1,5 @@ -spec2def(ks.sys ks.spec) +spec2def(ks.sys ks.spec ADD_IMPORTLIB) add_definitions( -DBUILDING_KS @@ -48,4 +48,4 @@ add_pch(ks priv.h) add_importlibs(ks ntoskrnl hal) add_dependencies(ks psdk bugcodes) add_cd_file(TARGET ks DESTINATION reactos/system32/drivers FOR all) -add_importlib_target(ks.spec ks.sys) + diff --git a/reactos/drivers/network/ndis/CMakeLists.txt b/reactos/drivers/network/ndis/CMakeLists.txt index 823a0558619..4ebdac096b1 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) +spec2def(ndis.sys ndis.spec ADD_IMPORTLIB) list(APPEND SOURCE ndis/30stubs.c @@ -43,4 +43,4 @@ add_importlibs(ndis ntoskrnl hal) add_pch(ndis include/ndissys.h) add_cd_file(TARGET ndis DESTINATION reactos/system32/drivers FOR all) -add_importlib_target(ndis.spec ndis.sys) + diff --git a/reactos/drivers/storage/class/class2/CMakeLists.txt b/reactos/drivers/storage/class/class2/CMakeLists.txt index 6f748ebac76..d17def7f987 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) +spec2def(class2.sys class2.spec ADD_IMPORTLIB) list(APPEND SOURCE class2.c @@ -13,6 +13,6 @@ add_library(class2 SHARED ${SOURCE}) set_module_type(class2 kernelmodedriver) add_importlibs(class2 scsiport ntoskrnl hal) -add_importlib_target(class2.spec class2.sys) + add_cd_file(TARGET class2 DESTINATION reactos/system32/drivers NO_CAB FOR all) diff --git a/reactos/drivers/storage/classpnp/CMakeLists.txt b/reactos/drivers/storage/classpnp/CMakeLists.txt index 39fce52bc3f..839f837c41c 100644 --- a/reactos/drivers/storage/classpnp/CMakeLists.txt +++ b/reactos/drivers/storage/classpnp/CMakeLists.txt @@ -17,7 +17,7 @@ if(ARCH MATCHES i386) endif() endif() -spec2def(classpnp.sys classpnp.spec) +spec2def(classpnp.sys classpnp.spec ADD_IMPORTLIB) list(APPEND SOURCE autorun.c @@ -42,5 +42,5 @@ add_pch(classpnp classp.h) target_link_libraries(classpnp ${PSEH_LIB} libcntpr) set_module_type(classpnp kernelmodedriver) add_importlibs(classpnp hal ntoskrnl) -add_importlib_target(classpnp.spec classpnp.sys) + add_cd_file(TARGET classpnp DESTINATION reactos/system32/drivers NO_CAB FOR all) diff --git a/reactos/drivers/storage/ide/pciidex/CMakeLists.txt b/reactos/drivers/storage/ide/pciidex/CMakeLists.txt index dc92e126b90..65c21ef13ed 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) +spec2def(pciidex.sys pciidex.spec ADD_IMPORTLIB) list(APPEND SOURCE fdo.c @@ -15,4 +15,4 @@ add_pch(pciidex pciidex.h) set_module_type(pciidex kernelmodedriver) add_importlibs(pciidex ntoskrnl) add_cd_file(TARGET pciidex DESTINATION reactos/system32/drivers NO_CAB FOR all) -add_importlib_target(pciidex.spec pciidex.sys) + diff --git a/reactos/drivers/storage/scsiport/CMakeLists.txt b/reactos/drivers/storage/scsiport/CMakeLists.txt index 9bccd57df1a..e2554ce86ae 100644 --- a/reactos/drivers/storage/scsiport/CMakeLists.txt +++ b/reactos/drivers/storage/scsiport/CMakeLists.txt @@ -1,5 +1,5 @@ -spec2def(scsiport.sys scsiport.spec) +spec2def(scsiport.sys scsiport.spec ADD_IMPORTLIB) list(APPEND SOURCE scsiport.c @@ -11,5 +11,5 @@ add_library(scsiport SHARED ${SOURCE}) add_pch(scsiport precomp.h) set_module_type(scsiport kernelmodedriver) add_importlibs(scsiport ntoskrnl hal) -add_importlib_target(scsiport.spec scsiport.sys) + add_cd_file(TARGET scsiport DESTINATION reactos/system32/drivers NO_CAB FOR all) diff --git a/reactos/drivers/usb/usbd/CMakeLists.txt b/reactos/drivers/usb/usbd/CMakeLists.txt index 41327ee933d..59f8c6b28a3 100644 --- a/reactos/drivers/usb/usbd/CMakeLists.txt +++ b/reactos/drivers/usb/usbd/CMakeLists.txt @@ -1,5 +1,5 @@ -spec2def(usbd.sys usbd.spec) +spec2def(usbd.sys usbd.spec ADD_IMPORTLIB) add_library(usbd SHARED usbd.c @@ -8,6 +8,6 @@ add_library(usbd SHARED set_module_type(usbd kernelmodedriver) add_importlibs(usbd ntoskrnl hal) -add_importlib_target(usbd.spec usbd.sys) + add_cd_file(TARGET usbd DESTINATION reactos/system32/drivers NO_CAB FOR all) \ No newline at end of file diff --git a/reactos/drivers/video/font/ftfd/CMakeLists.txt b/reactos/drivers/video/font/ftfd/CMakeLists.txt index f80c55f226d..d0ac420b88f 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) +spec2def(ftfd.dll ftfd.spec ADD_IMPORTLIB) add_library(ftfd SHARED enable.c @@ -23,4 +23,4 @@ add_pch(ftfd ftfd.h) add_importlibs(ftfd win32k) add_dependencies(ftfd psdk) add_cd_file(TARGET ftfd DESTINATION reactos/system32 FOR all) -add_importlib_target(ftfd.spec ftfd.dll) + diff --git a/reactos/drivers/video/videoprt/CMakeLists.txt b/reactos/drivers/video/videoprt/CMakeLists.txt index 1176c47b8df..e7687d34651 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) +spec2def(videoprt.sys videoprt.spec ADD_IMPORTLIB) list(APPEND SOURCE agp.c @@ -30,4 +30,4 @@ add_importlibs(videoprt ntoskrnl hal) add_pch(videoprt videoprt.h) add_cd_file(TARGET videoprt DESTINATION reactos/system32/drivers FOR all) -add_importlib_target(videoprt.spec videoprt.sys) + diff --git a/reactos/drivers/wdm/audio/drm/drmk/CMakeLists.txt b/reactos/drivers/wdm/audio/drm/drmk/CMakeLists.txt index ad45fb344f0..3e575393812 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) +spec2def(drmk.sys drmk.spec ADD_IMPORTLIB) list(APPEND SOURCE stubs.cpp @@ -13,5 +13,5 @@ add_library(drmk SHARED ${SOURCE}) set_module_type(drmk kernelmodedriver ENTRYPOINT 0) add_importlibs(drmk ntoskrnl) -add_importlib_target(drmk.spec drmk.sys) + add_cd_file(TARGET drmk DESTINATION reactos/system32/drivers FOR all) diff --git a/reactos/drivers/wmi/CMakeLists.txt b/reactos/drivers/wmi/CMakeLists.txt index a1a22f71829..2fb593b2893 100644 --- a/reactos/drivers/wmi/CMakeLists.txt +++ b/reactos/drivers/wmi/CMakeLists.txt @@ -1,5 +1,5 @@ -spec2def(wmilib.sys wmilib.spec) +spec2def(wmilib.sys wmilib.spec ADD_IMPORTLIB) list(APPEND SOURCE wmilib.c @@ -11,5 +11,5 @@ add_library(wmilib SHARED ${SOURCE}) set_module_type(wmilib kernelmodedriver ENTRYPOINT 0) add_importlibs(wmilib ntoskrnl) -add_importlib_target(wmilib.spec wmilib.sys) + add_cd_file(TARGET wmilib DESTINATION reactos/system32/drivers FOR all) diff --git a/reactos/hal/halx86/CMakeLists.txt b/reactos/hal/halx86/CMakeLists.txt index 06073b8e424..052a046cb00 100644 --- a/reactos/hal/halx86/CMakeLists.txt +++ b/reactos/hal/halx86/CMakeLists.txt @@ -103,7 +103,7 @@ if(ARCH MATCHES i386) up/pic.c up/processor.c) - spec2def(hal.dll ../hal.spec) + spec2def(hal.dll ../hal.spec ADD_IMPORTLIB) # hal add_library(hal SHARED @@ -125,7 +125,7 @@ if(ARCH MATCHES i386) endif() # hal acpi - spec2def(halacpi.dll ../hal.spec halacpi) + spec2def(halacpi.dll ../hal.spec) add_library(halacpi SHARED ${HAL_UP_SOURCE} ${HAL_PIC_SOURCE} @@ -151,7 +151,7 @@ if(ARCH MATCHES i386) elseif(ARCH MATCHES amd64) - spec2def(hal.dll ../hal.spec) + spec2def(hal.dll ../hal.spec ADD_IMPORTLIB) list(APPEND HAL_SOURCE ${HAL_GENERIC_SOURCE} @@ -181,4 +181,4 @@ elseif(ARCH MATCHES amd64) endif() -add_importlib_target(../hal.spec hal.dll) + diff --git a/reactos/ntoskrnl/CMakeLists.txt b/reactos/ntoskrnl/CMakeLists.txt index 2bb9e5f87aa..be9b425ccb7 100644 --- a/reactos/ntoskrnl/CMakeLists.txt +++ b/reactos/ntoskrnl/CMakeLists.txt @@ -1,5 +1,5 @@ -spec2def(ntoskrnl.exe ntoskrnl.spec) +spec2def(ntoskrnl.exe ntoskrnl.spec ADD_IMPORTLIB) include_directories( ${REACTOS_SOURCE_DIR} @@ -455,6 +455,6 @@ add_pch(ntoskrnl include/ntoskrnl.h) add_dependencies(ntoskrnl psdk bugcodes asm) add_cd_file(TARGET ntoskrnl DESTINATION reactos/system32 NO_CAB FOR all) -add_importlib_target(ntoskrnl.spec ntoskrnl.exe) + add_library(ntdllsys ntdll.S) diff --git a/reactos/subsystems/csr/csrsrv/CMakeLists.txt b/reactos/subsystems/csr/csrsrv/CMakeLists.txt index c37b0a75a4e..8c48af51816 100644 --- a/reactos/subsystems/csr/csrsrv/CMakeLists.txt +++ b/reactos/subsystems/csr/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(csrsrv2.dll csrsrv2.spec) +spec2def(csrsrv2.dll csrsrv2.spec ADD_IMPORTLIB) list(APPEND SOURCE api.c @@ -27,4 +27,4 @@ add_pch(csrsrv2 srv.h) add_dependencies(csrsrv2 psdk bugcodes) add_cd_file(TARGET csrsrv2 DESTINATION reactos/system32 FOR all) -add_importlib_target(csrsrv2.spec csrsrv2.dll) + diff --git a/reactos/subsystems/win32/csrss/csrsrv/CMakeLists.txt b/reactos/subsystems/win32/csrss/csrsrv/CMakeLists.txt index 11724f36adf..0fabebe4bc0 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) +spec2def(csrsrv.dll csrsrv.spec ADD_IMPORTLIB) list(APPEND SOURCE api/process.c @@ -28,4 +28,4 @@ add_pch(csrsrv srv.h) add_dependencies(csrsrv psdk bugcodes) add_cd_file(TARGET csrsrv DESTINATION reactos/system32 FOR all) -add_importlib_target(csrsrv.spec csrsrv.dll) + diff --git a/reactos/subsystems/win32/win32k/CMakeLists.txt b/reactos/subsystems/win32/win32k/CMakeLists.txt index 3df47b16c3c..9a52201ebb0 100644 --- a/reactos/subsystems/win32/win32k/CMakeLists.txt +++ b/reactos/subsystems/win32/win32k/CMakeLists.txt @@ -1,5 +1,5 @@ -spec2def(win32k.sys win32k.spec) +spec2def(win32k.sys win32k.spec ADD_IMPORTLIB) include_directories( . @@ -197,7 +197,7 @@ target_link_libraries(win32k add_importlibs(win32k ntoskrnl hal ftfd) add_pch(win32k pch.h) add_cd_file(TARGET win32k DESTINATION reactos/system32 FOR all) -add_importlib_target(win32k.spec win32k.sys) + add_library(win32ksys sys-stubs.S) set_source_files_properties(sys-stubs.S PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/w32ksvc.h)