From 459a045652cafb4edc08bbe578229ad97bbae67c Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Mon, 20 Feb 2012 22:08:14 +0000 Subject: [PATCH] [CMAKE] * Simplify the way we handle importlib targets by taking control of the importlib name. svn path=/trunk/; revision=55764 --- .../base/shell/explorer/notifyhook/CMakeLists.txt | 2 +- reactos/cmake/gcc.cmake | 15 +++------------ reactos/cmake/msvc.cmake | 14 +++----------- reactos/dll/directx/dinput/CMakeLists.txt | 2 +- reactos/dll/directx/dinput8/CMakeLists.txt | 2 +- reactos/dll/directx/dplay/CMakeLists.txt | 2 +- reactos/dll/directx/dplayx/CMakeLists.txt | 2 +- reactos/dll/directx/dsound/CMakeLists.txt | 2 +- reactos/dll/directx/ksuser/CMakeLists.txt | 2 +- reactos/dll/directx/wine/d3d9/CMakeLists.txt | 2 +- reactos/dll/directx/wine/d3dx9_24/CMakeLists.txt | 2 +- reactos/dll/directx/wine/d3dx9_25/CMakeLists.txt | 2 +- reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt | 6 ++---- reactos/dll/directx/wine/ddraw/CMakeLists.txt | 2 +- reactos/dll/directx/wine/wined3d/CMakeLists.txt | 2 +- reactos/dll/ntdll/CMakeLists.txt | 2 +- reactos/dll/win32/acledit/CMakeLists.txt | 2 +- reactos/dll/win32/aclui/CMakeLists.txt | 2 +- reactos/dll/win32/advapi32/CMakeLists.txt | 2 +- reactos/dll/win32/atl/CMakeLists.txt | 2 +- reactos/dll/win32/avicap32/CMakeLists.txt | 2 +- reactos/dll/win32/avifil32/CMakeLists.txt | 2 +- reactos/dll/win32/batt/CMakeLists.txt | 2 +- reactos/dll/win32/beepmidi/CMakeLists.txt | 2 +- reactos/dll/win32/cabinet/CMakeLists.txt | 2 +- reactos/dll/win32/cards/CMakeLists.txt | 2 +- reactos/dll/win32/comctl32/CMakeLists.txt | 2 +- reactos/dll/win32/comdlg32/CMakeLists.txt | 2 +- reactos/dll/win32/compstui/CMakeLists.txt | 2 +- reactos/dll/win32/credui/CMakeLists.txt | 2 +- reactos/dll/win32/crypt32/CMakeLists.txt | 11 ++--------- reactos/dll/win32/cryptnet/CMakeLists.txt | 10 ++-------- reactos/dll/win32/cryptui/CMakeLists.txt | 2 +- reactos/dll/win32/dbghelp/CMakeLists.txt | 2 +- reactos/dll/win32/devmgr/CMakeLists.txt | 2 +- reactos/dll/win32/dhcpcsvc/CMakeLists.txt | 2 +- reactos/dll/win32/dnsapi/CMakeLists.txt | 2 +- reactos/dll/win32/fmifs/CMakeLists.txt | 2 +- reactos/dll/win32/gdi32/CMakeLists.txt | 2 +- reactos/dll/win32/gdiplus/CMakeLists.txt | 2 +- reactos/dll/win32/getuname/CMakeLists.txt | 2 +- reactos/dll/win32/glu32/CMakeLists.txt | 2 +- reactos/dll/win32/hlink/CMakeLists.txt | 2 +- reactos/dll/win32/icmp/CMakeLists.txt | 2 +- reactos/dll/win32/imagehlp/CMakeLists.txt | 2 +- reactos/dll/win32/imm32/CMakeLists.txt | 2 +- reactos/dll/win32/inetcomm/CMakeLists.txt | 2 +- reactos/dll/win32/iphlpapi/CMakeLists.txt | 2 +- reactos/dll/win32/kernel32/CMakeLists.txt | 2 +- reactos/dll/win32/loadperf/CMakeLists.txt | 2 +- reactos/dll/win32/localui/CMakeLists.txt | 2 +- reactos/dll/win32/lpk/CMakeLists.txt | 2 +- reactos/dll/win32/lsasrv/CMakeLists.txt | 2 +- reactos/dll/win32/lz32/CMakeLists.txt | 2 +- reactos/dll/win32/mlang/CMakeLists.txt | 2 +- reactos/dll/win32/mpr/CMakeLists.txt | 2 +- reactos/dll/win32/msacm32/CMakeLists.txt | 2 +- reactos/dll/win32/msi/CMakeLists.txt | 2 +- reactos/dll/win32/msimg32/CMakeLists.txt | 2 +- reactos/dll/win32/msports/CMakeLists.txt | 2 +- reactos/dll/win32/msvcrt/CMakeLists.txt | 2 +- reactos/dll/win32/msvfw32/CMakeLists.txt | 2 +- reactos/dll/win32/mswsock/CMakeLists.txt | 2 +- reactos/dll/win32/netapi32/CMakeLists.txt | 2 +- reactos/dll/win32/newdev/CMakeLists.txt | 2 +- reactos/dll/win32/ntdsapi/CMakeLists.txt | 2 +- reactos/dll/win32/odbccp32/CMakeLists.txt | 2 +- reactos/dll/win32/ole32/CMakeLists.txt | 2 +- reactos/dll/win32/oleacc/CMakeLists.txt | 2 +- reactos/dll/win32/oleaut32/CMakeLists.txt | 2 +- reactos/dll/win32/oledlg/CMakeLists.txt | 2 +- reactos/dll/win32/opengl32/CMakeLists.txt | 2 +- reactos/dll/win32/pdh/CMakeLists.txt | 2 +- reactos/dll/win32/powrprof/CMakeLists.txt | 2 +- reactos/dll/win32/psapi/CMakeLists.txt | 2 +- reactos/dll/win32/rasapi32/CMakeLists.txt | 2 +- reactos/dll/win32/riched20/CMakeLists.txt | 2 +- reactos/dll/win32/rpcrt4/CMakeLists.txt | 2 +- reactos/dll/win32/rsaenh/CMakeLists.txt | 2 +- reactos/dll/win32/samlib/CMakeLists.txt | 2 +- reactos/dll/win32/secur32/CMakeLists.txt | 2 +- reactos/dll/win32/sensapi/CMakeLists.txt | 2 +- reactos/dll/win32/setupapi/CMakeLists.txt | 2 +- reactos/dll/win32/sfc_os/CMakeLists.txt | 2 +- reactos/dll/win32/shdocvw/CMakeLists.txt | 2 +- reactos/dll/win32/shell32/CMakeLists.txt | 2 +- reactos/dll/win32/shlwapi/CMakeLists.txt | 2 +- reactos/dll/win32/smdll/CMakeLists.txt | 2 +- reactos/dll/win32/snmpapi/CMakeLists.txt | 2 +- reactos/dll/win32/spoolss/CMakeLists.txt | 2 +- reactos/dll/win32/ufatx/CMakeLists.txt | 2 +- reactos/dll/win32/urlmon/CMakeLists.txt | 2 +- reactos/dll/win32/user32/CMakeLists.txt | 2 +- reactos/dll/win32/userenv/CMakeLists.txt | 2 +- reactos/dll/win32/usp10/CMakeLists.txt | 2 +- reactos/dll/win32/uxtheme/CMakeLists.txt | 2 +- reactos/dll/win32/version/CMakeLists.txt | 2 +- reactos/dll/win32/windowscodecs/CMakeLists.txt | 2 +- reactos/dll/win32/winhttp/CMakeLists.txt | 2 +- reactos/dll/win32/wininet/CMakeLists.txt | 2 +- reactos/dll/win32/winmm/CMakeLists.txt | 2 +- reactos/dll/win32/winspool/CMakeLists.txt | 14 +++++++------- reactos/dll/win32/wintrust/CMakeLists.txt | 2 +- reactos/dll/win32/wlanapi/CMakeLists.txt | 2 +- reactos/dll/win32/wldap32/CMakeLists.txt | 2 +- reactos/dll/win32/ws2_32/CMakeLists.txt | 2 +- reactos/dll/win32/ws2help/CMakeLists.txt | 2 +- reactos/dll/win32/xinput1_3/CMakeLists.txt | 2 +- reactos/dll/win32/xmllite/CMakeLists.txt | 2 +- reactos/drivers/base/bootvid/CMakeLists.txt | 2 +- reactos/drivers/base/kdcom/CMakeLists.txt | 2 +- reactos/drivers/base/kddll/CMakeLists.txt | 2 +- reactos/drivers/battery/battc/CMakeLists.txt | 2 +- reactos/drivers/directx/dxgthk/CMakeLists.txt | 2 +- reactos/drivers/hid/hidclass/CMakeLists.txt | 2 +- reactos/drivers/hid/hidparse/CMakeLists.txt | 2 +- reactos/drivers/ksfilter/ks/CMakeLists.txt | 2 +- reactos/drivers/network/ndis/CMakeLists.txt | 2 +- .../drivers/storage/class/class2/CMakeLists.txt | 2 +- reactos/drivers/storage/classpnp/CMakeLists.txt | 2 +- .../drivers/storage/ide/pciidex/CMakeLists.txt | 2 +- reactos/drivers/storage/scsiport/CMakeLists.txt | 2 +- reactos/drivers/usb/usbd/CMakeLists.txt | 2 +- reactos/drivers/video/font/ftfd/CMakeLists.txt | 2 +- reactos/drivers/video/videoprt/CMakeLists.txt | 2 +- reactos/drivers/wdm/audio/drm/drmk/CMakeLists.txt | 2 +- reactos/drivers/wmi/CMakeLists.txt | 2 +- reactos/hal/halx86/CMakeLists.txt | 2 +- reactos/ntoskrnl/CMakeLists.txt | 2 +- reactos/subsystems/csr/csrsrv/CMakeLists.txt | 2 +- .../subsystems/win32/csrss/csrsrv/CMakeLists.txt | 2 +- reactos/subsystems/win32/win32k/CMakeLists.txt | 2 +- 132 files changed, 145 insertions(+), 177 deletions(-) diff --git a/reactos/base/shell/explorer/notifyhook/CMakeLists.txt b/reactos/base/shell/explorer/notifyhook/CMakeLists.txt index b3eda1e7589..8a2768ca989 100644 --- a/reactos/base/shell/explorer/notifyhook/CMakeLists.txt +++ b/reactos/base/shell/explorer/notifyhook/CMakeLists.txt @@ -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) +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 dc82e51085c..18959650abc 100644 --- a/reactos/cmake/gcc.cmake +++ b/reactos/cmake/gcc.cmake @@ -192,33 +192,24 @@ if(NOT ARCH MATCHES i386) set(DECO_OPTION "-@") endif() -function(add_importlib_target _exports_file) +function(add_importlib_target _exports_file _implib_name) get_filename_component(_name ${_exports_file} NAME_WE) get_filename_component(_extension ${_exports_file} EXT) - get_target_property(_suffix ${_name} SUFFIX) - if(${_suffix} STREQUAL "_suffix-NOTFOUND") - get_target_property(_type ${_name} TYPE) - if(${_type} MATCHES EXECUTABLE) - set(_suffix ".exe") - else() - set(_suffix ".dll") - endif() - endif() if(${_extension} STREQUAL ".spec") # Normal importlib creation add_custom_command( OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a - COMMAND native-spec2def -n=${_name}${_suffix} -a=${ARCH2} -d=${CMAKE_CURRENT_BINARY_DIR}/${_name}_implib.def ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} + COMMAND native-spec2def -n=${_implib_name} -a=${ARCH2} -d=${CMAKE_CURRENT_BINARY_DIR}/${_name}_implib.def ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} COMMAND ${CMAKE_DLLTOOL} --def ${CMAKE_CURRENT_BINARY_DIR}/${_name}_implib.def --kill-at --output-lib=${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} native-spec2def) # Delayed importlib creation add_custom_command( OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_delayed.a - COMMAND native-spec2def -n=${_name}${_suffix} -a=${ARCH2} -d=${CMAKE_CURRENT_BINARY_DIR}/${_name}_delayed_implib.def ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} + COMMAND native-spec2def -n=${_implib_name} -a=${ARCH2} -d=${CMAKE_CURRENT_BINARY_DIR}/${_name}_delayed_implib.def ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} COMMAND ${CMAKE_DLLTOOL} --def ${CMAKE_CURRENT_BINARY_DIR}/${_name}_delayed_implib.def --kill-at --output-delaylib ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_delayed.a DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} native-spec2def) diff --git a/reactos/cmake/msvc.cmake b/reactos/cmake/msvc.cmake index 6255cdf333c..dd551a5c01d 100644 --- a/reactos/cmake/msvc.cmake +++ b/reactos/cmake/msvc.cmake @@ -132,22 +132,14 @@ function(set_rc_compiler) endfunction() # Thanks MS for creating a stupid linker -function(add_importlib_target _exports_file) +function(add_importlib_target _exports_file _implib_name) + get_filename_component(_name ${_exports_file} NAME_WE) - get_target_property(_suffix ${_name} SUFFIX) - if(${_suffix} STREQUAL "_suffix-NOTFOUND") - get_target_property(_type ${_name} TYPE) - if(${_type} MATCHES EXECUTABLE) - set(_suffix ".exe") - else() - set(_suffix ".dll") - endif() - endif() # Generate the asm stub file and the export def file add_custom_command( OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.asm ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_exp.def - COMMAND native-spec2def --ms --kill-at -a=${SPEC2DEF_ARCH} --implib -n=${_name}${_suffix} -d=${CMAKE_BINARY_DIR}/importlibs/lib${_name}_exp.def -l=${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.asm ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} + COMMAND native-spec2def --ms --kill-at -a=${SPEC2DEF_ARCH} --implib -n=${_implib_name} -d=${CMAKE_BINARY_DIR}/importlibs/lib${_name}_exp.def -l=${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.asm ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} native-spec2def) # Assemble the stub file diff --git a/reactos/dll/directx/dinput/CMakeLists.txt b/reactos/dll/directx/dinput/CMakeLists.txt index fa9517849e9..88d7dbb7b9a 100644 --- a/reactos/dll/directx/dinput/CMakeLists.txt +++ b/reactos/dll/directx/dinput/CMakeLists.txt @@ -37,4 +37,4 @@ add_importlibs(dinput ntdll) add_cd_file(TARGET dinput DESTINATION reactos/system32 FOR all) -add_importlib_target(dinput.spec) +add_importlib_target(dinput.spec dinput.dll) diff --git a/reactos/dll/directx/dinput8/CMakeLists.txt b/reactos/dll/directx/dinput8/CMakeLists.txt index 3257e49996b..e3320dac1aa 100644 --- a/reactos/dll/directx/dinput8/CMakeLists.txt +++ b/reactos/dll/directx/dinput8/CMakeLists.txt @@ -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) +add_importlib_target(dinput8.spec dinput8.dll) diff --git a/reactos/dll/directx/dplay/CMakeLists.txt b/reactos/dll/directx/dplay/CMakeLists.txt index e3a83e611ac..56d054ea9e3 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 libdplayx) +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 77c80743427..d93cc69df3a 100644 --- a/reactos/dll/directx/dplayx/CMakeLists.txt +++ b/reactos/dll/directx/dplayx/CMakeLists.txt @@ -37,4 +37,4 @@ add_importlibs(dplayx ntdll) add_cd_file(TARGET dplayx DESTINATION reactos/system32 FOR all) -add_importlib_target(dplayx.spec) +add_importlib_target(dplayx.spec dplayx.dll) diff --git a/reactos/dll/directx/dsound/CMakeLists.txt b/reactos/dll/directx/dsound/CMakeLists.txt index 84f3782c9ff..386b25070ea 100644 --- a/reactos/dll/directx/dsound/CMakeLists.txt +++ b/reactos/dll/directx/dsound/CMakeLists.txt @@ -39,4 +39,4 @@ add_importlibs(dsound ntdll) add_cd_file(TARGET dsound DESTINATION reactos/system32 FOR all) -add_importlib_target(dsound.spec) +add_importlib_target(dsound.spec dsound.dll) diff --git a/reactos/dll/directx/ksuser/CMakeLists.txt b/reactos/dll/directx/ksuser/CMakeLists.txt index 5f3acb71205..c0a5d379719 100644 --- a/reactos/dll/directx/ksuser/CMakeLists.txt +++ b/reactos/dll/directx/ksuser/CMakeLists.txt @@ -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) +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 708d6c5c55c..f44bdd79226 100644 --- a/reactos/dll/directx/wine/d3d9/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3d9/CMakeLists.txt @@ -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) +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 5ad6cb35f9e..8befd21e559 100644 --- a/reactos/dll/directx/wine/d3dx9_24/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3dx9_24/CMakeLists.txt @@ -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 libd3dx9_36) +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 c7b5b2c2a61..9c4e7f42f5e 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 libd3dx9_24 libd3dx9_36) +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 1d5c48876a9..297ab6c97cf 100644 --- a/reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt @@ -23,9 +23,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_library(d3dx9_36 SHARED ${SOURCE}) set_module_type(d3dx9_36 win32dll) - -target_link_libraries(d3dx9_36 - wine) +target_link_libraries(d3dx9_36 wine) add_importlibs(d3dx9_36 d3d9 @@ -38,4 +36,4 @@ 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) +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 042f2b11647..300c52f52c6 100644 --- a/reactos/dll/directx/wine/ddraw/CMakeLists.txt +++ b/reactos/dll/directx/wine/ddraw/CMakeLists.txt @@ -54,4 +54,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) +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 dc5fd3cfdbf..910ebdf0dd7 100644 --- a/reactos/dll/directx/wine/wined3d/CMakeLists.txt +++ b/reactos/dll/directx/wine/wined3d/CMakeLists.txt @@ -69,7 +69,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) +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 62069bb9986..30bb062bd7a 100644 --- a/reactos/dll/ntdll/CMakeLists.txt +++ b/reactos/dll/ntdll/CMakeLists.txt @@ -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) +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 0ca09cddb56..624370e22c3 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) +add_importlib_target(acledit.spec acledit.dll) diff --git a/reactos/dll/win32/aclui/CMakeLists.txt b/reactos/dll/win32/aclui/CMakeLists.txt index 4e5455b9c90..a347839d9ac 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) +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 384afdd7f66..6cf82ea985f 100644 --- a/reactos/dll/win32/advapi32/CMakeLists.txt +++ b/reactos/dll/win32/advapi32/CMakeLists.txt @@ -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) +add_importlib_target(advapi32.spec advapi32.dll) diff --git a/reactos/dll/win32/atl/CMakeLists.txt b/reactos/dll/win32/atl/CMakeLists.txt index 3fc13e9ead8..b5b4bc64e69 100644 --- a/reactos/dll/win32/atl/CMakeLists.txt +++ b/reactos/dll/win32/atl/CMakeLists.txt @@ -37,7 +37,7 @@ add_importlibs(atl kernel32 ntdll) -add_importlib_target(atl.spec) +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 3b27072c803..3447be905ea 100644 --- a/reactos/dll/win32/avicap32/CMakeLists.txt +++ b/reactos/dll/win32/avicap32/CMakeLists.txt @@ -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) +add_importlib_target(avicap32.spec avicap32.dll) diff --git a/reactos/dll/win32/avifil32/CMakeLists.txt b/reactos/dll/win32/avifil32/CMakeLists.txt index d1041cbc50b..88705de378a 100644 --- a/reactos/dll/win32/avifil32/CMakeLists.txt +++ b/reactos/dll/win32/avifil32/CMakeLists.txt @@ -40,5 +40,5 @@ add_importlibs(avifil32 kernel32 ntdll) -add_importlib_target(avifil32.spec) +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 25503c2c373..69f22afe2e0 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) +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 6cd7fd59479..7a87899355c 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) +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 a79b033fb63..1e7a06d5633 100644 --- a/reactos/dll/win32/cabinet/CMakeLists.txt +++ b/reactos/dll/win32/cabinet/CMakeLists.txt @@ -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) +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 c1a5569040f..1c5993ce9b4 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) +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 ee594835a4c..6765354b89d 100644 --- a/reactos/dll/win32/comctl32/CMakeLists.txt +++ b/reactos/dll/win32/comctl32/CMakeLists.txt @@ -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) +add_importlib_target(comctl32.spec comctl32.dll) diff --git a/reactos/dll/win32/comdlg32/CMakeLists.txt b/reactos/dll/win32/comdlg32/CMakeLists.txt index 2da07bb1fa4..4566bba7029 100644 --- a/reactos/dll/win32/comdlg32/CMakeLists.txt +++ b/reactos/dll/win32/comdlg32/CMakeLists.txt @@ -41,4 +41,4 @@ add_importlibs(comdlg32 ntdll) add_cd_file(TARGET comdlg32 DESTINATION reactos/system32 FOR all) -add_importlib_target(comdlg32.spec) +add_importlib_target(comdlg32.spec comdlg32.dll) diff --git a/reactos/dll/win32/compstui/CMakeLists.txt b/reactos/dll/win32/compstui/CMakeLists.txt index c4fbafa2238..4696e2fe066 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) +add_importlib_target(compstui.spec compstui.dll) diff --git a/reactos/dll/win32/credui/CMakeLists.txt b/reactos/dll/win32/credui/CMakeLists.txt index aa4783407c0..8846ce954b7 100644 --- a/reactos/dll/win32/credui/CMakeLists.txt +++ b/reactos/dll/win32/credui/CMakeLists.txt @@ -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) +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 3c1342307f3..8562e480e2b 100644 --- a/reactos/dll/win32/crypt32/CMakeLists.txt +++ b/reactos/dll/win32/crypt32/CMakeLists.txt @@ -42,16 +42,9 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/crypt32.def) add_library(crypt32 SHARED ${SOURCE}) - allow_warnings(crypt32) - set_module_type(crypt32 win32dll) - -target_link_libraries(crypt32 - wine - ${PSEH_LIB} - oldnames) - +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) +add_importlib_target(crypt32.spec crypt32.dll) diff --git a/reactos/dll/win32/cryptnet/CMakeLists.txt b/reactos/dll/win32/cryptnet/CMakeLists.txt index e7266cc422f..610992bab9c 100644 --- a/reactos/dll/win32/cryptnet/CMakeLists.txt +++ b/reactos/dll/win32/cryptnet/CMakeLists.txt @@ -13,12 +13,6 @@ add_library(cryptnet SHARED ${SOURCE}) 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) +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 ba4c382ec0d..275df359732 100644 --- a/reactos/dll/win32/cryptui/CMakeLists.txt +++ b/reactos/dll/win32/cryptui/CMakeLists.txt @@ -32,5 +32,5 @@ add_importlibs(cryptui kernel32 ntdll) -add_importlib_target(cryptui.spec) +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 e1679c70584..b4aa679bd32 100644 --- a/reactos/dll/win32/dbghelp/CMakeLists.txt +++ b/reactos/dll/win32/dbghelp/CMakeLists.txt @@ -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) +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 22fa462e0d8..23248f61608 100644 --- a/reactos/dll/win32/devmgr/CMakeLists.txt +++ b/reactos/dll/win32/devmgr/CMakeLists.txt @@ -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) +add_importlib_target(devmgr.spec devmgr.dll) diff --git a/reactos/dll/win32/dhcpcsvc/CMakeLists.txt b/reactos/dll/win32/dhcpcsvc/CMakeLists.txt index f82c89cdfc8..21a17038616 100644 --- a/reactos/dll/win32/dhcpcsvc/CMakeLists.txt +++ b/reactos/dll/win32/dhcpcsvc/CMakeLists.txt @@ -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) +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 5e89d65dc2f..3aada06acd3 100644 --- a/reactos/dll/win32/dnsapi/CMakeLists.txt +++ b/reactos/dll/win32/dnsapi/CMakeLists.txt @@ -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) +add_importlib_target(dnsapi.spec dnsapi.dll) diff --git a/reactos/dll/win32/fmifs/CMakeLists.txt b/reactos/dll/win32/fmifs/CMakeLists.txt index 9f86250cc3e..c3ce7ec3592 100644 --- a/reactos/dll/win32/fmifs/CMakeLists.txt +++ b/reactos/dll/win32/fmifs/CMakeLists.txt @@ -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) +add_importlib_target(fmifs.spec fmifs.dll) diff --git a/reactos/dll/win32/gdi32/CMakeLists.txt b/reactos/dll/win32/gdi32/CMakeLists.txt index 4eff1e832d0..0166feb3b4f 100644 --- a/reactos/dll/win32/gdi32/CMakeLists.txt +++ b/reactos/dll/win32/gdi32/CMakeLists.txt @@ -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) +add_importlib_target(gdi32.spec gdi32.dll) diff --git a/reactos/dll/win32/gdiplus/CMakeLists.txt b/reactos/dll/win32/gdiplus/CMakeLists.txt index 947475f124e..639a863c659 100644 --- a/reactos/dll/win32/gdiplus/CMakeLists.txt +++ b/reactos/dll/win32/gdiplus/CMakeLists.txt @@ -47,7 +47,7 @@ add_importlibs(gdiplus kernel32 ntdll) -add_importlib_target(gdiplus.spec) +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 26dd7c41948..cb7185b5929 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) +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 a40bee404ab..426fde22276 100644 --- a/reactos/dll/win32/glu32/CMakeLists.txt +++ b/reactos/dll/win32/glu32/CMakeLists.txt @@ -122,4 +122,4 @@ add_importlibs(glu32 ntdll) add_cd_file(TARGET glu32 DESTINATION reactos/system32 FOR all) -add_importlib_target(glu32.spec) +add_importlib_target(glu32.spec glu32.dll) diff --git a/reactos/dll/win32/hlink/CMakeLists.txt b/reactos/dll/win32/hlink/CMakeLists.txt index 85d1388d88f..4b8d45ec69e 100644 --- a/reactos/dll/win32/hlink/CMakeLists.txt +++ b/reactos/dll/win32/hlink/CMakeLists.txt @@ -28,5 +28,5 @@ add_importlibs(hlink ntdll) add_pch(hlink hlink_private.h) -add_importlib_target(hlink.spec) +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 da27f38a60c..db61216696c 100644 --- a/reactos/dll/win32/icmp/CMakeLists.txt +++ b/reactos/dll/win32/icmp/CMakeLists.txt @@ -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) +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 573098c670e..9f977d5c00a 100644 --- a/reactos/dll/win32/imagehlp/CMakeLists.txt +++ b/reactos/dll/win32/imagehlp/CMakeLists.txt @@ -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) +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 dfdd313b82f..c81a64b1bfe 100644 --- a/reactos/dll/win32/imm32/CMakeLists.txt +++ b/reactos/dll/win32/imm32/CMakeLists.txt @@ -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) +add_importlib_target(imm32.spec imm32.dll) diff --git a/reactos/dll/win32/inetcomm/CMakeLists.txt b/reactos/dll/win32/inetcomm/CMakeLists.txt index 0e93af8e56b..883d7f6a642 100644 --- a/reactos/dll/win32/inetcomm/CMakeLists.txt +++ b/reactos/dll/win32/inetcomm/CMakeLists.txt @@ -37,5 +37,5 @@ add_importlibs(inetcomm kernel32 ntdll) -add_importlib_target(inetcomm.spec) +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 22f28f28111..68891751248 100644 --- a/reactos/dll/win32/iphlpapi/CMakeLists.txt +++ b/reactos/dll/win32/iphlpapi/CMakeLists.txt @@ -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) +add_importlib_target(iphlpapi.spec iphlpapi.dll) diff --git a/reactos/dll/win32/kernel32/CMakeLists.txt b/reactos/dll/win32/kernel32/CMakeLists.txt index db679ca1e6d..fb8c390c92f 100644 --- a/reactos/dll/win32/kernel32/CMakeLists.txt +++ b/reactos/dll/win32/kernel32/CMakeLists.txt @@ -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) +add_importlib_target(kernel32.spec kernel32.dll) diff --git a/reactos/dll/win32/loadperf/CMakeLists.txt b/reactos/dll/win32/loadperf/CMakeLists.txt index 2e5d86ba3d0..53387b64bfc 100644 --- a/reactos/dll/win32/loadperf/CMakeLists.txt +++ b/reactos/dll/win32/loadperf/CMakeLists.txt @@ -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) +add_importlib_target(loadperf.spec loadperf.dll) diff --git a/reactos/dll/win32/localui/CMakeLists.txt b/reactos/dll/win32/localui/CMakeLists.txt index 7221755ddfd..d589333f77d 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) +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 3353895d05e..dfe5306a7de 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) +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 a4778fb8516..8fa08d8e516 100644 --- a/reactos/dll/win32/lsasrv/CMakeLists.txt +++ b/reactos/dll/win32/lsasrv/CMakeLists.txt @@ -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) +add_importlib_target(lsasrv.spec lsasrv.dll) diff --git a/reactos/dll/win32/lz32/CMakeLists.txt b/reactos/dll/win32/lz32/CMakeLists.txt index efa2369a102..c9e85369001 100644 --- a/reactos/dll/win32/lz32/CMakeLists.txt +++ b/reactos/dll/win32/lz32/CMakeLists.txt @@ -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) +add_importlib_target(lz32.spec lz32.dll) diff --git a/reactos/dll/win32/mlang/CMakeLists.txt b/reactos/dll/win32/mlang/CMakeLists.txt index 5b53d924975..167f98fc9ed 100644 --- a/reactos/dll/win32/mlang/CMakeLists.txt +++ b/reactos/dll/win32/mlang/CMakeLists.txt @@ -30,6 +30,6 @@ add_importlibs(mlang kernel32 ntdll) -add_importlib_target(mlang.spec) +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 65789654de2..8c0c8fb4adb 100644 --- a/reactos/dll/win32/mpr/CMakeLists.txt +++ b/reactos/dll/win32/mpr/CMakeLists.txt @@ -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) +add_importlib_target(mpr.spec mpr.dll) diff --git a/reactos/dll/win32/msacm32/CMakeLists.txt b/reactos/dll/win32/msacm32/CMakeLists.txt index 989d31c2c6b..f035fa9fcee 100644 --- a/reactos/dll/win32/msacm32/CMakeLists.txt +++ b/reactos/dll/win32/msacm32/CMakeLists.txt @@ -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) +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 4c465b1a5ff..3b8e7ee1368 100644 --- a/reactos/dll/win32/msi/CMakeLists.txt +++ b/reactos/dll/win32/msi/CMakeLists.txt @@ -98,4 +98,4 @@ add_cd_file(TARGET msi DESTINATION reactos/system32 FOR all) endif(NOT MSVC) -add_importlib_target(msi.spec) +add_importlib_target(msi.spec msi.dll) diff --git a/reactos/dll/win32/msimg32/CMakeLists.txt b/reactos/dll/win32/msimg32/CMakeLists.txt index f571b8b0114..996715d6d4c 100644 --- a/reactos/dll/win32/msimg32/CMakeLists.txt +++ b/reactos/dll/win32/msimg32/CMakeLists.txt @@ -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) +add_importlib_target(msimg32.spec msimg32.dll) diff --git a/reactos/dll/win32/msports/CMakeLists.txt b/reactos/dll/win32/msports/CMakeLists.txt index 286fb5a7850..fc4c147c8de 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) +add_importlib_target(msports.spec msports.dll) diff --git a/reactos/dll/win32/msvcrt/CMakeLists.txt b/reactos/dll/win32/msvcrt/CMakeLists.txt index 6a5987b7838..b59cbb85327 100644 --- a/reactos/dll/win32/msvcrt/CMakeLists.txt +++ b/reactos/dll/win32/msvcrt/CMakeLists.txt @@ -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) +add_importlib_target(msvcrt.spec msvcrt.dll) diff --git a/reactos/dll/win32/msvfw32/CMakeLists.txt b/reactos/dll/win32/msvfw32/CMakeLists.txt index 57367f75378..73e01f8ffbe 100644 --- a/reactos/dll/win32/msvfw32/CMakeLists.txt +++ b/reactos/dll/win32/msvfw32/CMakeLists.txt @@ -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) +add_importlib_target(msvfw32.spec msvfw32.dll) diff --git a/reactos/dll/win32/mswsock/CMakeLists.txt b/reactos/dll/win32/mswsock/CMakeLists.txt index 8f71900e620..74ea54690ae 100644 --- a/reactos/dll/win32/mswsock/CMakeLists.txt +++ b/reactos/dll/win32/mswsock/CMakeLists.txt @@ -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) +add_importlib_target(mswsock.spec mswsock.dll) diff --git a/reactos/dll/win32/netapi32/CMakeLists.txt b/reactos/dll/win32/netapi32/CMakeLists.txt index 988a6461ed1..a4f45f0e89d 100644 --- a/reactos/dll/win32/netapi32/CMakeLists.txt +++ b/reactos/dll/win32/netapi32/CMakeLists.txt @@ -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) +add_importlib_target(netapi32.spec netapi32.dll) diff --git a/reactos/dll/win32/newdev/CMakeLists.txt b/reactos/dll/win32/newdev/CMakeLists.txt index cc3d43a8ca1..3ebbcc0eae5 100644 --- a/reactos/dll/win32/newdev/CMakeLists.txt +++ b/reactos/dll/win32/newdev/CMakeLists.txt @@ -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) +add_importlib_target(newdev.spec newdev.dll) diff --git a/reactos/dll/win32/ntdsapi/CMakeLists.txt b/reactos/dll/win32/ntdsapi/CMakeLists.txt index 924821967f6..5afc0750cb2 100644 --- a/reactos/dll/win32/ntdsapi/CMakeLists.txt +++ b/reactos/dll/win32/ntdsapi/CMakeLists.txt @@ -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) +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 054991cfe63..5ffff78daac 100644 --- a/reactos/dll/win32/odbccp32/CMakeLists.txt +++ b/reactos/dll/win32/odbccp32/CMakeLists.txt @@ -20,5 +20,5 @@ add_importlibs(odbccp32 kernel32 ntdll) -add_importlib_target(odbccp32.spec) +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 caaba25f7fa..74826202b1d 100644 --- a/reactos/dll/win32/ole32/CMakeLists.txt +++ b/reactos/dll/win32/ole32/CMakeLists.txt @@ -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) +add_importlib_target(ole32.spec ole32.dll) diff --git a/reactos/dll/win32/oleacc/CMakeLists.txt b/reactos/dll/win32/oleacc/CMakeLists.txt index e9948efb432..45afa0cf59c 100644 --- a/reactos/dll/win32/oleacc/CMakeLists.txt +++ b/reactos/dll/win32/oleacc/CMakeLists.txt @@ -19,5 +19,5 @@ target_link_libraries(oleacc wine) add_importlibs(oleacc user32 msvcrt kernel32 ntdll) -add_importlib_target(oleacc.spec) +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 30ed9c77add..343cc230051 100644 --- a/reactos/dll/win32/oleaut32/CMakeLists.txt +++ b/reactos/dll/win32/oleaut32/CMakeLists.txt @@ -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) +add_importlib_target(oleaut32.spec oleaut32.dll) diff --git a/reactos/dll/win32/oledlg/CMakeLists.txt b/reactos/dll/win32/oledlg/CMakeLists.txt index e4d838accc1..e9c57e9647d 100644 --- a/reactos/dll/win32/oledlg/CMakeLists.txt +++ b/reactos/dll/win32/oledlg/CMakeLists.txt @@ -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) +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 6a9a75ef569..e243802e026 100644 --- a/reactos/dll/win32/opengl32/CMakeLists.txt +++ b/reactos/dll/win32/opengl32/CMakeLists.txt @@ -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) +add_importlib_target(opengl32.spec opengl32.dll) diff --git a/reactos/dll/win32/pdh/CMakeLists.txt b/reactos/dll/win32/pdh/CMakeLists.txt index edd3534c193..98c7870b0fb 100644 --- a/reactos/dll/win32/pdh/CMakeLists.txt +++ b/reactos/dll/win32/pdh/CMakeLists.txt @@ -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) +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 7b7f8f8fd6b..e75758f1737 100644 --- a/reactos/dll/win32/powrprof/CMakeLists.txt +++ b/reactos/dll/win32/powrprof/CMakeLists.txt @@ -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) +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 dda730acbd0..0549ccf0f3b 100644 --- a/reactos/dll/win32/psapi/CMakeLists.txt +++ b/reactos/dll/win32/psapi/CMakeLists.txt @@ -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) +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 a3954286467..120748adb17 100644 --- a/reactos/dll/win32/rasapi32/CMakeLists.txt +++ b/reactos/dll/win32/rasapi32/CMakeLists.txt @@ -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) +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 89281ad5394..9390711c107 100644 --- a/reactos/dll/win32/riched20/CMakeLists.txt +++ b/reactos/dll/win32/riched20/CMakeLists.txt @@ -51,5 +51,5 @@ add_importlibs(riched20 ntdll) add_pch(riched20 editor.h) -add_importlib_target(riched20.spec) +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 2f9d2d89754..a4f48a0056a 100644 --- a/reactos/dll/win32/rpcrt4/CMakeLists.txt +++ b/reactos/dll/win32/rpcrt4/CMakeLists.txt @@ -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) +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 1fea4c9d719..3d95a4fc8bf 100644 --- a/reactos/dll/win32/rsaenh/CMakeLists.txt +++ b/reactos/dll/win32/rsaenh/CMakeLists.txt @@ -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) +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 b26706182cd..f511b7e7572 100644 --- a/reactos/dll/win32/samlib/CMakeLists.txt +++ b/reactos/dll/win32/samlib/CMakeLists.txt @@ -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) +add_importlib_target(samlib.spec samlib.dll) diff --git a/reactos/dll/win32/secur32/CMakeLists.txt b/reactos/dll/win32/secur32/CMakeLists.txt index a460f046863..2efb95d6ac5 100644 --- a/reactos/dll/win32/secur32/CMakeLists.txt +++ b/reactos/dll/win32/secur32/CMakeLists.txt @@ -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) +add_importlib_target(secur32.spec secur32.dll) diff --git a/reactos/dll/win32/sensapi/CMakeLists.txt b/reactos/dll/win32/sensapi/CMakeLists.txt index 9612da919a8..26181ca279c 100644 --- a/reactos/dll/win32/sensapi/CMakeLists.txt +++ b/reactos/dll/win32/sensapi/CMakeLists.txt @@ -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) +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 74d33c9b5b8..e8f7649bda0 100644 --- a/reactos/dll/win32/setupapi/CMakeLists.txt +++ b/reactos/dll/win32/setupapi/CMakeLists.txt @@ -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) +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 0ffd0e7d5ca..486c2b0d79f 100644 --- a/reactos/dll/win32/sfc_os/CMakeLists.txt +++ b/reactos/dll/win32/sfc_os/CMakeLists.txt @@ -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) +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 20f505b1487..2a1a0888150 100644 --- a/reactos/dll/win32/shdocvw/CMakeLists.txt +++ b/reactos/dll/win32/shdocvw/CMakeLists.txt @@ -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) +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 342a05480b7..26039c450e1 100644 --- a/reactos/dll/win32/shell32/CMakeLists.txt +++ b/reactos/dll/win32/shell32/CMakeLists.txt @@ -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) +add_importlib_target(shell32.spec shell32.dll) diff --git a/reactos/dll/win32/shlwapi/CMakeLists.txt b/reactos/dll/win32/shlwapi/CMakeLists.txt index 546cc06ceca..aa57a47b454 100644 --- a/reactos/dll/win32/shlwapi/CMakeLists.txt +++ b/reactos/dll/win32/shlwapi/CMakeLists.txt @@ -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) +add_importlib_target(shlwapi.spec shlwapi.dll) diff --git a/reactos/dll/win32/smdll/CMakeLists.txt b/reactos/dll/win32/smdll/CMakeLists.txt index e12d8a4ea63..fb3aeca4578 100644 --- a/reactos/dll/win32/smdll/CMakeLists.txt +++ b/reactos/dll/win32/smdll/CMakeLists.txt @@ -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) +add_importlib_target(smdll.spec smdll.dll) diff --git a/reactos/dll/win32/snmpapi/CMakeLists.txt b/reactos/dll/win32/snmpapi/CMakeLists.txt index 325d372ccf1..c5c88235d28 100644 --- a/reactos/dll/win32/snmpapi/CMakeLists.txt +++ b/reactos/dll/win32/snmpapi/CMakeLists.txt @@ -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) +add_importlib_target(snmpapi.spec snmpapi.dll) diff --git a/reactos/dll/win32/spoolss/CMakeLists.txt b/reactos/dll/win32/spoolss/CMakeLists.txt index eede3e7b325..1f6317b7351 100644 --- a/reactos/dll/win32/spoolss/CMakeLists.txt +++ b/reactos/dll/win32/spoolss/CMakeLists.txt @@ -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) +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 8304306bbce..3298fde7956 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) +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 cf667761faf..6bbffb341f1 100644 --- a/reactos/dll/win32/urlmon/CMakeLists.txt +++ b/reactos/dll/win32/urlmon/CMakeLists.txt @@ -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) +add_importlib_target(urlmon.spec urlmon.dll) diff --git a/reactos/dll/win32/user32/CMakeLists.txt b/reactos/dll/win32/user32/CMakeLists.txt index e1b0657ed80..c154b9e0c53 100644 --- a/reactos/dll/win32/user32/CMakeLists.txt +++ b/reactos/dll/win32/user32/CMakeLists.txt @@ -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) +add_importlib_target(user32.spec user32.dll) diff --git a/reactos/dll/win32/userenv/CMakeLists.txt b/reactos/dll/win32/userenv/CMakeLists.txt index f9327fedf99..d7865f1cd3e 100644 --- a/reactos/dll/win32/userenv/CMakeLists.txt +++ b/reactos/dll/win32/userenv/CMakeLists.txt @@ -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) +add_importlib_target(userenv.spec userenv.dll) diff --git a/reactos/dll/win32/usp10/CMakeLists.txt b/reactos/dll/win32/usp10/CMakeLists.txt index e0732956029..d8ef8cb93ea 100644 --- a/reactos/dll/win32/usp10/CMakeLists.txt +++ b/reactos/dll/win32/usp10/CMakeLists.txt @@ -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) +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 0d5a2e398b4..7a231840f89 100644 --- a/reactos/dll/win32/uxtheme/CMakeLists.txt +++ b/reactos/dll/win32/uxtheme/CMakeLists.txt @@ -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) +add_importlib_target(uxtheme.spec uxtheme.dll) diff --git a/reactos/dll/win32/version/CMakeLists.txt b/reactos/dll/win32/version/CMakeLists.txt index faf0680239c..29dcb00ced1 100644 --- a/reactos/dll/win32/version/CMakeLists.txt +++ b/reactos/dll/win32/version/CMakeLists.txt @@ -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) +add_importlib_target(version.spec version.dll) diff --git a/reactos/dll/win32/windowscodecs/CMakeLists.txt b/reactos/dll/win32/windowscodecs/CMakeLists.txt index a0165d37923..ff7eaac60c2 100644 --- a/reactos/dll/win32/windowscodecs/CMakeLists.txt +++ b/reactos/dll/win32/windowscodecs/CMakeLists.txt @@ -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) +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 dd2250be5e9..da5bb6d26b0 100644 --- a/reactos/dll/win32/winhttp/CMakeLists.txt +++ b/reactos/dll/win32/winhttp/CMakeLists.txt @@ -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) +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 9b4873ad40f..dc9301c233d 100644 --- a/reactos/dll/win32/wininet/CMakeLists.txt +++ b/reactos/dll/win32/wininet/CMakeLists.txt @@ -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) +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 bf5677c1316..f6f19c001d7 100644 --- a/reactos/dll/win32/winmm/CMakeLists.txt +++ b/reactos/dll/win32/winmm/CMakeLists.txt @@ -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) +add_importlib_target(winmm.spec winmm.dll) diff --git a/reactos/dll/win32/winspool/CMakeLists.txt b/reactos/dll/win32/winspool/CMakeLists.txt index a9b99047617..ae413a9df72 100644 --- a/reactos/dll/win32/winspool/CMakeLists.txt +++ b/reactos/dll/win32/winspool/CMakeLists.txt @@ -13,12 +13,12 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/winspool_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/winspool.def) -add_library(winspool SHARED ${SOURCE}) +add_library(winspool.drv SHARED ${SOURCE}) -set_target_properties(winspool PROPERTIES SUFFIX ".drv") +set_target_properties(winspool.drv PROPERTIES SUFFIX "") -set_module_type(winspool win32dll UNICODE) -target_link_libraries(winspool wine) -add_importlibs(winspool advapi32 shlwapi msvcrt kernel32 ntdll) -add_cd_file(TARGET winspool DESTINATION reactos/system32 FOR all) -add_importlib_target(winspool.spec) +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 7fc3b99ce02..7276f43ea64 100644 --- a/reactos/dll/win32/wintrust/CMakeLists.txt +++ b/reactos/dll/win32/wintrust/CMakeLists.txt @@ -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) +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 1f87bd30765..ca305153197 100644 --- a/reactos/dll/win32/wlanapi/CMakeLists.txt +++ b/reactos/dll/win32/wlanapi/CMakeLists.txt @@ -20,7 +20,7 @@ target_link_libraries(wlanapi ${PSEH_LIB}) add_importlibs(wlanapi rpcrt4 msvcrt kernel32 ntdll) -add_importlib_target(wlanapi.spec) +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 c97f5e443f7..ac6fff2023e 100644 --- a/reactos/dll/win32/wldap32/CMakeLists.txt +++ b/reactos/dll/win32/wldap32/CMakeLists.txt @@ -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) +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 8b4ec94d44b..a98b6b6e34b 100644 --- a/reactos/dll/win32/ws2_32/CMakeLists.txt +++ b/reactos/dll/win32/ws2_32/CMakeLists.txt @@ -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) +add_importlib_target(ws2_32.spec ws2_32.dll) diff --git a/reactos/dll/win32/ws2help/CMakeLists.txt b/reactos/dll/win32/ws2help/CMakeLists.txt index 52c5e9ed9a9..ed63ed67f3b 100644 --- a/reactos/dll/win32/ws2help/CMakeLists.txt +++ b/reactos/dll/win32/ws2help/CMakeLists.txt @@ -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) +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 9d37edd1e66..383f30c6791 100644 --- a/reactos/dll/win32/xinput1_3/CMakeLists.txt +++ b/reactos/dll/win32/xinput1_3/CMakeLists.txt @@ -11,7 +11,7 @@ list(APPEND SOURCE add_library(xinput1_3 SHARED ${SOURCE}) -add_importlib_target(xinput1_3.spec) +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 855cd3a8e82..0232c474d9d 100644 --- a/reactos/dll/win32/xmllite/CMakeLists.txt +++ b/reactos/dll/win32/xmllite/CMakeLists.txt @@ -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) +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 ded06a8e48f..6a8da3b0c4e 100644 --- a/reactos/drivers/base/bootvid/CMakeLists.txt +++ b/reactos/drivers/base/bootvid/CMakeLists.txt @@ -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) +add_importlib_target(bootvid.spec bootvid.dll) diff --git a/reactos/drivers/base/kdcom/CMakeLists.txt b/reactos/drivers/base/kdcom/CMakeLists.txt index 8e8a2e17ec8..c8125771a4d 100644 --- a/reactos/drivers/base/kdcom/CMakeLists.txt +++ b/reactos/drivers/base/kdcom/CMakeLists.txt @@ -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) +add_importlib_target(kdcom.spec kdcom.dll) diff --git a/reactos/drivers/base/kddll/CMakeLists.txt b/reactos/drivers/base/kddll/CMakeLists.txt index 8083793ca03..b720b9c7e15 100644 --- a/reactos/drivers/base/kddll/CMakeLists.txt +++ b/reactos/drivers/base/kddll/CMakeLists.txt @@ -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) +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 79accddba83..8bd2ac7f760 100644 --- a/reactos/drivers/battery/battc/CMakeLists.txt +++ b/reactos/drivers/battery/battc/CMakeLists.txt @@ -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) +add_importlib_target(battc.spec battc.sys) diff --git a/reactos/drivers/directx/dxgthk/CMakeLists.txt b/reactos/drivers/directx/dxgthk/CMakeLists.txt index cd1dbc827cc..26bec98022e 100644 --- a/reactos/drivers/directx/dxgthk/CMakeLists.txt +++ b/reactos/drivers/directx/dxgthk/CMakeLists.txt @@ -11,6 +11,6 @@ add_library(dxgthk SHARED ${SOURCE}) set_module_type(dxgthk kernelmodedriver) add_importlibs(dxgthk win32k) -add_importlib_target(dxgthk.spec) +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 f5f69220a3a..0178e854333 100644 --- a/reactos/drivers/hid/hidclass/CMakeLists.txt +++ b/reactos/drivers/hid/hidclass/CMakeLists.txt @@ -16,6 +16,6 @@ set_target_properties(hidclass PROPERTIES SUFFIX ".sys") add_importlibs(hidclass ntoskrnl hidparse hal) -add_importlib_target(hidclass.spec) +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 52f388da794..5c1ae6601f0 100644 --- a/reactos/drivers/hid/hidparse/CMakeLists.txt +++ b/reactos/drivers/hid/hidparse/CMakeLists.txt @@ -11,7 +11,7 @@ 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) +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 85ba42829c1..27b21c0d99f 100644 --- a/reactos/drivers/ksfilter/ks/CMakeLists.txt +++ b/reactos/drivers/ksfilter/ks/CMakeLists.txt @@ -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) +add_importlib_target(ks.spec ks.sys) diff --git a/reactos/drivers/network/ndis/CMakeLists.txt b/reactos/drivers/network/ndis/CMakeLists.txt index f548a1b17d9..823a0558619 100644 --- a/reactos/drivers/network/ndis/CMakeLists.txt +++ b/reactos/drivers/network/ndis/CMakeLists.txt @@ -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) +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 8820226b9ce..6f748ebac76 100644 --- a/reactos/drivers/storage/class/class2/CMakeLists.txt +++ b/reactos/drivers/storage/class/class2/CMakeLists.txt @@ -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) +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 f0f9884e48c..39fce52bc3f 100644 --- a/reactos/drivers/storage/classpnp/CMakeLists.txt +++ b/reactos/drivers/storage/classpnp/CMakeLists.txt @@ -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) +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 15d9e173a7c..dc92e126b90 100644 --- a/reactos/drivers/storage/ide/pciidex/CMakeLists.txt +++ b/reactos/drivers/storage/ide/pciidex/CMakeLists.txt @@ -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) +add_importlib_target(pciidex.spec pciidex.sys) diff --git a/reactos/drivers/storage/scsiport/CMakeLists.txt b/reactos/drivers/storage/scsiport/CMakeLists.txt index fd8dafb4956..9bccd57df1a 100644 --- a/reactos/drivers/storage/scsiport/CMakeLists.txt +++ b/reactos/drivers/storage/scsiport/CMakeLists.txt @@ -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) +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 b04f9e61ed6..41327ee933d 100644 --- a/reactos/drivers/usb/usbd/CMakeLists.txt +++ b/reactos/drivers/usb/usbd/CMakeLists.txt @@ -8,6 +8,6 @@ add_library(usbd SHARED set_module_type(usbd kernelmodedriver) add_importlibs(usbd ntoskrnl hal) -add_importlib_target(usbd.spec) +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 817a76c0614..c45ab457bfe 100644 --- a/reactos/drivers/video/font/ftfd/CMakeLists.txt +++ b/reactos/drivers/video/font/ftfd/CMakeLists.txt @@ -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) +add_importlib_target(ftfd.spec ftfd.dll) diff --git a/reactos/drivers/video/videoprt/CMakeLists.txt b/reactos/drivers/video/videoprt/CMakeLists.txt index 1eea498eb64..1176c47b8df 100644 --- a/reactos/drivers/video/videoprt/CMakeLists.txt +++ b/reactos/drivers/video/videoprt/CMakeLists.txt @@ -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) +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 5026ba75cc5..ad45fb344f0 100644 --- a/reactos/drivers/wdm/audio/drm/drmk/CMakeLists.txt +++ b/reactos/drivers/wdm/audio/drm/drmk/CMakeLists.txt @@ -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) +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 c67295004ca..a1a22f71829 100644 --- a/reactos/drivers/wmi/CMakeLists.txt +++ b/reactos/drivers/wmi/CMakeLists.txt @@ -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) +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 81d684e57ff..06073b8e424 100644 --- a/reactos/hal/halx86/CMakeLists.txt +++ b/reactos/hal/halx86/CMakeLists.txt @@ -181,4 +181,4 @@ elseif(ARCH MATCHES amd64) endif() -add_importlib_target(../hal.spec) +add_importlib_target(../hal.spec hal.dll) diff --git a/reactos/ntoskrnl/CMakeLists.txt b/reactos/ntoskrnl/CMakeLists.txt index 67d30c14650..3b28aa0efbd 100644 --- a/reactos/ntoskrnl/CMakeLists.txt +++ b/reactos/ntoskrnl/CMakeLists.txt @@ -453,6 +453,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) +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 24ffd89a58e..c37b0a75a4e 100644 --- a/reactos/subsystems/csr/csrsrv/CMakeLists.txt +++ b/reactos/subsystems/csr/csrsrv/CMakeLists.txt @@ -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) +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 46bb8691b23..11724f36adf 100644 --- a/reactos/subsystems/win32/csrss/csrsrv/CMakeLists.txt +++ b/reactos/subsystems/win32/csrss/csrsrv/CMakeLists.txt @@ -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) +add_importlib_target(csrsrv.spec csrsrv.dll) diff --git a/reactos/subsystems/win32/win32k/CMakeLists.txt b/reactos/subsystems/win32/win32k/CMakeLists.txt index 15611011731..3df47b16c3c 100644 --- a/reactos/subsystems/win32/win32k/CMakeLists.txt +++ b/reactos/subsystems/win32/win32k/CMakeLists.txt @@ -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) +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)