[CMAKE] Use modules instead of shared libraries

There is no need to compile our DLLs as shared libraries since we are managing symbols exports and imports through spec files. On my system, this reduces the configure-time by a factor of two.
2019-03-20 14:19:48 +01:00 · 2019-03-20 14:19:48 +01:00 · 23373acbb9
parent 050db4facb
commit 23373acbb9
544 changed files with 566 additions and 553 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -30,6 +30,7 @@ include(sdk/include/reactos/version.cmake)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON)
 set(CMAKE_SHARED_LIBRARY_PREFIX "")
+set(CMAKE_SHARED_MODULE_PREFIX "")
 set(CMAKE_SKIP_PREPROCESSED_SOURCE_RULES TRUE)
 set(CMAKE_SKIP_ASSEMBLY_SOURCE_RULES TRUE)
 set(CMAKE_COLOR_MAKEFILE OFF)
--- a/base/applications/charmap_new/CMakeLists.txt
+++ b/base/applications/charmap_new/CMakeLists.txt
@ -16,7 +16,7 @@ list(APPEND SOURCE
    MainWindow.cpp
 	)

-add_library(charmap SHARED
+add_library(charmap MODULE
    ${SOURCE}
    charmap.rc)

--- a/base/applications/kbswitch/kbsdll/CMakeLists.txt
+++ b/base/applications/kbswitch/kbsdll/CMakeLists.txt
@ -6,7 +6,7 @@ list(APPEND SOURCE
    kbsdll.rc
    ${CMAKE_CURRENT_BINARY_DIR}/kbsdll.def)

-add_library(kbsdll SHARED ${SOURCE})
+add_library(kbsdll MODULE ${SOURCE})
 set_module_type(kbsdll win32dll UNICODE)
 add_importlibs(kbsdll user32 comctl32 msvcrt kernel32)
 add_cd_file(TARGET kbsdll DESTINATION reactos/system32 FOR all)
--- a/base/applications/regedit/clb/CMakeLists.txt
+++ b/base/applications/regedit/clb/CMakeLists.txt
@ -1,7 +1,7 @@

 spec2def(clb.dll clb.spec)

-add_library(clb SHARED
+add_library(clb MODULE
    clb.c
    clb.rc
    ${CMAKE_CURRENT_BINARY_DIR}/clb.def)
--- a/base/services/dcomlaunch/CMakeLists.txt
+++ b/base/services/dcomlaunch/CMakeLists.txt
@ -1,6 +1,6 @@
 spec2def(dcomlaunch.dll dcomlaunch.spec ADD_IMPORTLIB)

-add_library(dcomlaunch SHARED
+add_library(dcomlaunch MODULE
    dcomlaunch.c
    network.c
    dcomlaunch.rc
--- a/base/services/dhcpcsvc/CMakeLists.txt
+++ b/base/services/dhcpcsvc/CMakeLists.txt
@ -19,7 +19,7 @@ list(APPEND SOURCE
    dhcpcsvc.c
    include/rosdhcp.h)

-add_library(dhcpcsvc SHARED
+add_library(dhcpcsvc MODULE
    ${SOURCE}
    dhcpcsvc.rc
    ${CMAKE_CURRENT_BINARY_DIR}/dhcpcsvc_stubs.c
--- a/base/services/schedsvc/CMakeLists.txt
+++ b/base/services/schedsvc/CMakeLists.txt
@ -3,7 +3,7 @@ include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/idl)
 add_rpc_files(server ${REACTOS_SOURCE_DIR}/sdk/include/reactos/idl/atsvc.idl)
 spec2def(schedsvc.dll schedsvc.spec ADD_IMPORTLIB)

-add_library(schedsvc SHARED
+add_library(schedsvc MODULE
    job.c
    rpcserver.c
    schedsvc.c
--- a/base/services/shsvcs/CMakeLists.txt
+++ b/base/services/shsvcs/CMakeLists.txt
@ -1,7 +1,7 @@

 spec2def(shsvcs.dll shsvcs.spec ADD_IMPORTLIB)

-add_library(shsvcs SHARED
+add_library(shsvcs MODULE
    shsvcs.c
    thmsvc.c
    thmserver.c
--- a/base/services/srvsvc/CMakeLists.txt
+++ b/base/services/srvsvc/CMakeLists.txt
@ -3,7 +3,7 @@ include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/idl)
 add_rpc_files(server ${REACTOS_SOURCE_DIR}/sdk/include/reactos/idl/srvsvc.idl)
 spec2def(srvsvc.dll srvsvc.spec ADD_IMPORTLIB)

-add_library(srvsvc SHARED
+add_library(srvsvc MODULE
    rpcserver.c
    srvsvc.c
    srvsvc.rc
--- a/base/services/umpnpmgr/CMakeLists.txt
+++ b/base/services/umpnpmgr/CMakeLists.txt
@ -3,7 +3,7 @@ include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/idl)
 add_rpc_files(server ${REACTOS_SOURCE_DIR}/sdk/include/reactos/idl/pnp.idl)
 spec2def(umpnpmgr.dll umpnpmgr.spec ADD_IMPORTLIB)

-add_library(umpnpmgr SHARED
+add_library(umpnpmgr MODULE
    umpnpmgr.c
    umpnpmgr.rc
    ${CMAKE_CURRENT_BINARY_DIR}/pnp_s.c
--- a/base/services/wkssvc/CMakeLists.txt
+++ b/base/services/wkssvc/CMakeLists.txt
@ -3,7 +3,7 @@ include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/idl)
 add_rpc_files(server ${REACTOS_SOURCE_DIR}/sdk/include/reactos/idl/wkssvc.idl)
 spec2def(wkssvc.dll wkssvc.spec ADD_IMPORTLIB)

-add_library(wkssvc SHARED
+add_library(wkssvc MODULE
    rpcserver.c
    wkssvc.c
    wkssvc.rc
--- a/base/services/wmisvc/CMakeLists.txt
+++ b/base/services/wmisvc/CMakeLists.txt
@ -1,6 +1,6 @@
 spec2def(wmisvc.dll wmisvc.spec ADD_IMPORTLIB)

-add_library(wmisvc SHARED
+add_library(wmisvc MODULE
    wmisvc.c
    wmisvc.rc
    ${CMAKE_CURRENT_BINARY_DIR}/wmisvc.def)
--- a/base/services/wuauserv/CMakeLists.txt
+++ b/base/services/wuauserv/CMakeLists.txt
@ -1,4 +1,4 @@
-add_library(wuauserv SHARED
+add_library(wuauserv MODULE
    wuauserv.c
    wuauserv.rc)

--- a/base/shell/rshell/CMakeLists.txt
+++ b/base/shell/rshell/CMakeLists.txt
@ -12,7 +12,7 @@ list(APPEND SOURCE
    misc.cpp
    ${CMAKE_CURRENT_BINARY_DIR}/rshell.def)

-add_library(rshell SHARED ${SOURCE})
+add_library(rshell MODULE ${SOURCE})

 set_module_type(rshell win32dll UNICODE)

--- a/dll/3rdparty/dxtn/CMakeLists.txt
+++ b/dll/3rdparty/dxtn/CMakeLists.txt
@ -1,7 +1,7 @@

 spec2def(dxtn.dll dxtn.spec)

-add_library(dxtn SHARED
+add_library(dxtn MODULE
    txc_compress_dxtn.c
    txc_fetch_dxtn.c
    ${CMAKE_CURRENT_BINARY_DIR}/dxtn.def)
--- a/dll/3rdparty/libjpeg/CMakeLists.txt
+++ b/dll/3rdparty/libjpeg/CMakeLists.txt
@ -59,7 +59,7 @@ list(APPEND SOURCE
    jmemnobs.c
    precomp.h)

-add_library(libjpeg SHARED ${SOURCE})
+add_library(libjpeg MODULE ${SOURCE})
 set_module_type(libjpeg win32dll)
 add_importlibs(libjpeg msvcrt kernel32)
 add_pch(libjpeg precomp.h SOURCE)
--- a/dll/3rdparty/libpng/CMakeLists.txt
+++ b/dll/3rdparty/libpng/CMakeLists.txt
@ -27,7 +27,7 @@ list(APPEND SOURCE
    pngwutil.c
    pngpriv.h)

-add_library(libpng SHARED ${SOURCE})
+add_library(libpng MODULE ${SOURCE})
 set_module_type(libpng win32dll)
 target_link_libraries(libpng zlib)
 add_importlibs(libpng msvcrt kernel32 ntdll)
--- a/dll/3rdparty/libtiff/CMakeLists.txt
+++ b/dll/3rdparty/libtiff/CMakeLists.txt
@ -54,7 +54,7 @@ list(APPEND SOURCE
    #tif_zstd.c
    precomp.h)

-add_library(libtiff SHARED ${SOURCE} libtiff.def)
+add_library(libtiff MODULE ${SOURCE} libtiff.def)
 set_module_type(libtiff win32dll)
 target_link_libraries(libtiff zlib getopt)
 add_importlibs(libtiff user32 msvcrt kernel32 ntdll)
--- a/dll/3rdparty/libtirpc/CMakeLists.txt
+++ b/dll/3rdparty/libtirpc/CMakeLists.txt
@ -87,7 +87,7 @@ list(APPEND SOURCE
    src/xdr_stdio.c
    precomp.h)

-add_library(libtirpc SHARED
+add_library(libtirpc MODULE
    ${SOURCE}
 #    libtirpc/libtirpc.rc
    libtirpc/libtirpc_ros.rc
--- a/dll/3rdparty/libxslt/CMakeLists.txt
+++ b/dll/3rdparty/libxslt/CMakeLists.txt
@ -34,7 +34,7 @@ list(APPEND SOURCE
    xsltutils.c
    precomp.h)

-add_library(libxslt SHARED ${SOURCE})
+add_library(libxslt MODULE ${SOURCE})
 set_module_type(libxslt win32dll)
 target_link_libraries(libxslt libxml2 iconv-static zlib)
 add_importlibs(libxslt msvcrt ws2_32 kernel32)
--- a/dll/3rdparty/mbedtls/CMakeLists.txt
+++ b/dll/3rdparty/mbedtls/CMakeLists.txt
@ -79,7 +79,7 @@ list(APPEND SOURCE
    #xtea.c
    )

-add_library(mbedtls SHARED
+add_library(mbedtls MODULE
    ${SOURCE}
    mbedtls.rc
    ${CMAKE_CURRENT_BINARY_DIR}/mbedtls.def)
--- a/dll/apisets/CMakeLists.txt
+++ b/dll/apisets/CMakeLists.txt
@ -17,7 +17,7 @@ function (add_apiset apiset_name baseaddress)
        -D_WCTYPE_DEFINED
        -D_CRT_ERRNO_DEFINED)

-    add_library(${apiset_name} SHARED
+    add_library(${apiset_name} MODULE
        ${CMAKE_CURRENT_BINARY_DIR}/${apiset_name}_stubs.c
        ${CMAKE_CURRENT_BINARY_DIR}/${apiset_name}.def)

--- a/dll/appcompat/apphelp/CMakeLists.txt
+++ b/dll/appcompat/apphelp/CMakeLists.txt
@ -30,7 +30,7 @@ list(APPEND HEADERS
    sdbwrite.h
    shimeng.h)

-add_library(apphelp SHARED
+add_library(apphelp MODULE
    ${SOURCE}
    ${HEADERS}
    apphelp.rc
--- a/dll/appcompat/shims/genral/CMakeLists.txt
+++ b/dll/appcompat/shims/genral/CMakeLists.txt
@ -10,7 +10,7 @@ list(APPEND SOURCE
    themes.c
    genral.spec)

-add_library(acgenral SHARED
+add_library(acgenral MODULE
    ${SOURCE}
    ${CMAKE_CURRENT_BINARY_DIR}/acgenral.def)

--- a/dll/appcompat/shims/layer/CMakeLists.txt
+++ b/dll/appcompat/shims/layer/CMakeLists.txt
@ -12,7 +12,7 @@ list(APPEND SOURCE
    main.c
    layer.spec)

-add_library(aclayers SHARED
+add_library(aclayers MODULE
    ${SOURCE}
    ${CMAKE_CURRENT_BINARY_DIR}/aclayers.def)

--- a/dll/cpl/access/CMakeLists.txt
+++ b/dll/cpl/access/CMakeLists.txt
@ -12,7 +12,7 @@ list(APPEND SOURCE

 add_rc_deps(access.rc ${CMAKE_CURRENT_SOURCE_DIR}/resources/applet.ico)

-add_library(access SHARED
+add_library(access MODULE
    ${SOURCE}
    access.rc
    ${CMAKE_CURRENT_BINARY_DIR}/access.def)
--- a/dll/cpl/appwiz/CMakeLists.txt
+++ b/dll/cpl/appwiz/CMakeLists.txt
@ -16,7 +16,7 @@ list(APPEND SOURCE
 file(GLOB appwiz_rc_deps resources/*.*)
 add_rc_deps(appwiz.rc ${appwiz_rc_deps})

-add_library(appwiz SHARED
+add_library(appwiz MODULE
    ${SOURCE}
    appwiz.rc
    ${CMAKE_CURRENT_BINARY_DIR}/appwiz.def)
--- a/dll/cpl/console/CMakeLists.txt
+++ b/dll/cpl/console/CMakeLists.txt
@ -15,7 +15,7 @@ list(APPEND SOURCE

 add_rc_deps(console.rc ${CMAKE_CURRENT_SOURCE_DIR}/res/terminal.ico)

-add_library(console SHARED
+add_library(console MODULE
    ${SOURCE}
    console.rc
    ${CMAKE_CURRENT_BINARY_DIR}/console.def)
--- a/dll/cpl/desk/CMakeLists.txt
+++ b/dll/cpl/desk/CMakeLists.txt
@ -26,7 +26,7 @@ list(APPEND SOURCE
 file(GLOB desk_rc_deps resources/*.*)
 add_rc_deps(desk.rc ${desk_rc_deps})

-add_library(desk SHARED
+add_library(desk MODULE
    ${SOURCE}
    guid.c
    desk.rc
--- a/dll/cpl/hdwwiz/CMakeLists.txt
+++ b/dll/cpl/hdwwiz/CMakeLists.txt
@ -3,7 +3,7 @@ spec2def(hdwwiz.cpl hdwwiz.spec)
 file(GLOB hdwwiz_rc_deps resources/*.*)
 add_rc_deps(hdwwiz.rc ${hdwwiz_rc_deps})

-add_library(hdwwiz SHARED
+add_library(hdwwiz MODULE
    hdwwiz.c
    hdwwiz.rc
    ${CMAKE_CURRENT_BINARY_DIR}/hdwwiz.def)
--- a/dll/cpl/hotplug/CMakeLists.txt
+++ b/dll/cpl/hotplug/CMakeLists.txt
@ -5,7 +5,7 @@ list(APPEND SOURCE
    hotplug.c
    enum.c)

-add_library(hotplug SHARED
+add_library(hotplug MODULE
    ${SOURCE}
    hotplug.rc
    ${CMAKE_CURRENT_BINARY_DIR}/hotplug.def)
--- a/dll/cpl/inetcpl/CMakeLists.txt
+++ b/dll/cpl/inetcpl/CMakeLists.txt
@ -14,7 +14,7 @@ list(APPEND SOURCE
 file(GLOB inetcpl_rc_deps resources/*.*)
 add_rc_deps(inetcpl.rc ${inetcpl_rc_deps})

-add_library(inetcpl SHARED
+add_library(inetcpl MODULE
    ${SOURCE}
    inetcpl.rc
    ${CMAKE_CURRENT_BINARY_DIR}/inetcpl_stubs.c
--- a/dll/cpl/input/CMakeLists.txt
+++ b/dll/cpl/input/CMakeLists.txt
@ -19,7 +19,7 @@ list(APPEND SOURCE

 add_rc_deps(input.rc ${CMAKE_CURRENT_SOURCE_DIR}/resources/keyboard-shortcuts.ico)

-add_library(input SHARED
+add_library(input MODULE
    ${SOURCE}
    input.rc
    ${CMAKE_CURRENT_BINARY_DIR}/input.def)
--- a/dll/cpl/intl/CMakeLists.txt
+++ b/dll/cpl/intl/CMakeLists.txt
@ -18,7 +18,7 @@ list(APPEND SOURCE

 add_rc_deps(intl.rc ${CMAKE_CURRENT_SOURCE_DIR}/resources/applet.ico)

-add_library(intl SHARED
+add_library(intl MODULE
    ${SOURCE}
    intl.rc
    ${CMAKE_CURRENT_BINARY_DIR}/intl.def)
--- a/dll/cpl/joy/CMakeLists.txt
+++ b/dll/cpl/joy/CMakeLists.txt
@ -2,7 +2,7 @@
 spec2def(joy.cpl joy.spec)
 add_rc_deps(joy.rc ${CMAKE_CURRENT_SOURCE_DIR}/resources/applet.ico)

-add_library(joy SHARED
+add_library(joy MODULE
    joy.c
    joy.rc
    ${CMAKE_CURRENT_BINARY_DIR}/joy.def)
--- a/dll/cpl/liccpa/CMakeLists.txt
+++ b/dll/cpl/liccpa/CMakeLists.txt
@ -8,7 +8,7 @@ list(APPEND SOURCE
 file(GLOB liccpa_rc_deps resources/*.*)
 add_rc_deps(liccpa.rc ${liccpa_rc_deps})

-add_library(liccpa SHARED
+add_library(liccpa MODULE
    ${SOURCE}
    liccpa.rc
    ${CMAKE_CURRENT_BINARY_DIR}/liccpa.def)
--- a/dll/cpl/main/CMakeLists.txt
+++ b/dll/cpl/main/CMakeLists.txt
@ -10,7 +10,7 @@ list(APPEND SOURCE
 file(GLOB main_rc_deps resources/*.*)
 add_rc_deps(main.rc ${main_rc_deps})

-add_library(main SHARED
+add_library(main MODULE
    ${SOURCE}
    main.rc
    ${CMAKE_CURRENT_BINARY_DIR}/main.def)
--- a/dll/cpl/mmsys/CMakeLists.txt
+++ b/dll/cpl/mmsys/CMakeLists.txt
@ -13,7 +13,7 @@ list(APPEND SOURCE
 file(GLOB mmsys_rc_deps resources/*.*)
 add_rc_deps(mmsys.rc ${mmsys_rc_deps})

-add_library(mmsys SHARED
+add_library(mmsys MODULE
    ${SOURCE}
    mmsys.rc
    ${CMAKE_CURRENT_BINARY_DIR}/mmsys.def)
--- a/dll/cpl/ncpa/CMakeLists.txt
+++ b/dll/cpl/ncpa/CMakeLists.txt
@ -1,7 +1,7 @@

 spec2def(ncpa.cpl ncpa.spec)

-add_library(ncpa SHARED
+add_library(ncpa MODULE
    ncpa.c
    ${CMAKE_CURRENT_BINARY_DIR}/ncpa.def)

--- a/dll/cpl/odbccp32/CMakeLists.txt
+++ b/dll/cpl/odbccp32/CMakeLists.txt
@ -1,7 +1,7 @@

 spec2def(odbccp32i.cpl odbccp32.spec)

-add_library(odbccp32i SHARED
+add_library(odbccp32i MODULE
    odbccp32.c
    odbccp32.rc
    ${CMAKE_CURRENT_BINARY_DIR}/odbccp32i.def)
--- a/dll/cpl/openglcfg/CMakeLists.txt
+++ b/dll/cpl/openglcfg/CMakeLists.txt
@ -8,7 +8,7 @@ list(APPEND SOURCE

 add_rc_deps(openglcfg.rc ${CMAKE_CURRENT_SOURCE_DIR}/resources/openglcfg.ico)

-add_library(openglcfg SHARED
+add_library(openglcfg MODULE
    ${SOURCE}
    openglcfg.rc
    ${CMAKE_CURRENT_BINARY_DIR}/openglcfg.def)
--- a/dll/cpl/powercfg/CMakeLists.txt
+++ b/dll/cpl/powercfg/CMakeLists.txt
@ -12,7 +12,7 @@ list(APPEND SOURCE
 file(GLOB powercfg_rc_deps resources/*.*)
 add_rc_deps(powercfg.rc ${powercfg_rc_deps})

-add_library(powercfg SHARED
+add_library(powercfg MODULE
    ${SOURCE}
    powercfg.rc
    ${CMAKE_CURRENT_BINARY_DIR}/powercfg.def)
--- a/dll/cpl/sysdm/CMakeLists.txt
+++ b/dll/cpl/sysdm/CMakeLists.txt
@ -21,7 +21,7 @@ list(APPEND SOURCE
 file(GLOB sysdm_rc_deps resources/*.*)
 add_rc_deps(sysdm.rc ${sysdm_rc_deps})

-add_library(sysdm SHARED
+add_library(sysdm MODULE
    ${SOURCE}
    sysdm.rc
    ${CMAKE_CURRENT_BINARY_DIR}/sysdm.def)
--- a/dll/cpl/telephon/CMakeLists.txt
+++ b/dll/cpl/telephon/CMakeLists.txt
@ -2,7 +2,7 @@
 spec2def(telephon.cpl telephon.spec)
 add_rc_deps(telephon.rc ${CMAKE_CURRENT_SOURCE_DIR}/resources/applet.ico)

-add_library(telephon SHARED
+add_library(telephon MODULE
    telephon.c
    telephon.rc
    ${CMAKE_CURRENT_BINARY_DIR}/telephon.def)
--- a/dll/cpl/timedate/CMakeLists.txt
+++ b/dll/cpl/timedate/CMakeLists.txt
@ -14,7 +14,7 @@ list(APPEND SOURCE
 file(GLOB timedate_rc_deps resources/*.*)
 add_rc_deps(timedate.rc ${timedate_rc_deps})

-add_library(timedate SHARED
+add_library(timedate MODULE
    ${SOURCE}
    timedate.rc
    ${CMAKE_CURRENT_BINARY_DIR}/timedate.def)
--- a/dll/cpl/usrmgr/CMakeLists.txt
+++ b/dll/cpl/usrmgr/CMakeLists.txt
@ -15,7 +15,7 @@ list(APPEND SOURCE
 file(GLOB usrmgr_rc_deps resources/*.*)
 add_rc_deps(usrmgr.rc ${usrmgr_rc_deps})

-add_library(usrmgr SHARED
+add_library(usrmgr MODULE
    ${SOURCE}
    usrmgr.rc
    ${CMAKE_CURRENT_BINARY_DIR}/usrmgr.def)
--- a/dll/cpl/wined3dcfg/CMakeLists.txt
+++ b/dll/cpl/wined3dcfg/CMakeLists.txt
@ -8,7 +8,7 @@ list(APPEND SOURCE

 add_rc_deps(wined3dcfg.rc ${CMAKE_CURRENT_SOURCE_DIR}/resources/wined3dcfg.ico)

-add_library(wined3dcfg SHARED
+add_library(wined3dcfg MODULE
    ${SOURCE}
    wined3dcfg.rc
    ${CMAKE_CURRENT_BINARY_DIR}/wined3dcfg.def)
--- a/dll/directx/d3d8thk/CMakeLists.txt
+++ b/dll/directx/d3d8thk/CMakeLists.txt
@ -1,7 +1,7 @@

 spec2def(d3d8thk.dll d3d8thk.spec)

-add_library(d3d8thk SHARED
+add_library(d3d8thk MODULE
    d3d8thk.rc
    ${CMAKE_CURRENT_BINARY_DIR}/d3d8thk.def)

--- a/dll/directx/ddraw/CMakeLists.txt
+++ b/dll/directx/ddraw/CMakeLists.txt
@ -39,7 +39,7 @@ list(APPEND SOURCE
    Vtable/DirectDrawSurface4_Vtable.c
    Vtable/DirectDrawSurface7_Vtable.c)

-add_library(ddraw SHARED ${SOURCE})
+add_library(ddraw MODULE ${SOURCE})
 set_module_type(ddraw win32dll)
 target_link_libraries(ddraw uuid dxguid ${PSEH_LIB})
 add_importlibs(ddraw advapi32 gdi32 user32 msvcrt kernel32 ntdll)
--- a/dll/directx/ksproxy/CMakeLists.txt
+++ b/dll/directx/ksproxy/CMakeLists.txt
@ -22,7 +22,7 @@ list(APPEND SOURCE
    qualityforward.cpp
    ${CMAKE_CURRENT_BINARY_DIR}/ksproxy.def)

-add_library(ksproxy SHARED ${SOURCE} ksproxy.rc)
+add_library(ksproxy MODULE ${SOURCE} ksproxy.rc)
 set_module_type(ksproxy win32dll)
 set_target_properties(ksproxy PROPERTIES SUFFIX ".ax")
 target_link_libraries(ksproxy strmiids)
--- a/dll/directx/ksuser/CMakeLists.txt
+++ b/dll/directx/ksuser/CMakeLists.txt
@ -1,7 +1,7 @@

 spec2def(ksuser.dll ksuser.spec ADD_IMPORTLIB)

-add_library(ksuser SHARED
+add_library(ksuser MODULE
    ksuser.c
    ksuser.rc
    ${CMAKE_CURRENT_BINARY_DIR}/ksuser.def)
--- a/dll/directx/wine/amstream/CMakeLists.txt
+++ b/dll/directx/wine/amstream/CMakeLists.txt
@ -12,7 +12,7 @@ list(APPEND SOURCE
    mediastreamfilter.c
    precomp.h)

-add_library(amstream SHARED
+add_library(amstream MODULE
    ${SOURCE}
    version.rc
    ${CMAKE_CURRENT_BINARY_DIR}/amstream.def)
--- a/dll/directx/wine/d3d8/CMakeLists.txt
+++ b/dll/directx/wine/d3d8/CMakeLists.txt
@ -19,7 +19,7 @@ list(APPEND SOURCE
    volume.c
    precomp.h)

-add_library(d3d8 SHARED
+add_library(d3d8 MODULE
    ${SOURCE}
    guid.c
    version.rc
--- a/dll/directx/wine/d3d9/CMakeLists.txt
+++ b/dll/directx/wine/d3d9/CMakeLists.txt
@ -21,7 +21,7 @@ list(APPEND SOURCE
    volume.c
    precomp.h)

-add_library(d3d9 SHARED
+add_library(d3d9 MODULE
    ${SOURCE}
    guid.c
    version.rc
--- a/dll/directx/wine/d3dcompiler_43/CMakeLists.txt
+++ b/dll/directx/wine/d3dcompiler_43/CMakeLists.txt
@ -21,7 +21,7 @@ list(APPEND SOURCE
    precomp.h
    ${CMAKE_CURRENT_BINARY_DIR}/d3dcompiler_43_stubs.c)

-add_library(d3dcompiler_43 SHARED
+add_library(d3dcompiler_43 MODULE
    ${SOURCE}
    version.rc
    ${CMAKE_CURRENT_BINARY_DIR}/d3dcompiler_43.def)
--- a/dll/directx/wine/d3drm/CMakeLists.txt
+++ b/dll/directx/wine/d3drm/CMakeLists.txt
@ -17,7 +17,7 @@ list(APPEND SOURCE
    viewport.c
    precomp.h)

-add_library(d3drm SHARED
+add_library(d3drm MODULE
    ${SOURCE}
    version.rc
    ${CMAKE_CURRENT_BINARY_DIR}/d3drm_stubs.c
--- a/dll/directx/wine/d3dx9_24/CMakeLists.txt
+++ b/dll/directx/wine/d3dx9_24/CMakeLists.txt
@ -8,7 +8,7 @@ list(APPEND SOURCE
    ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_24_stubs.c
    ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_24.def)

-add_library(d3dx9_24 SHARED ${SOURCE} version.rc)
+add_library(d3dx9_24 MODULE ${SOURCE} version.rc)
 set_module_type(d3dx9_24 win32dll)
 target_link_libraries(d3dx9_24 wine)
 add_importlibs(d3dx9_24 d3dx9_30 msvcrt kernel32 ntdll)
--- a/dll/directx/wine/d3dx9_25/CMakeLists.txt
+++ b/dll/directx/wine/d3dx9_25/CMakeLists.txt
@ -9,7 +9,7 @@ list(APPEND SOURCE
    ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_25_stubs.c
    ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_25.def)

-add_library(d3dx9_25 SHARED ${SOURCE} version.rc)
+add_library(d3dx9_25 MODULE ${SOURCE} version.rc)
 set_module_type(d3dx9_25 win32dll)
 target_link_libraries(d3dx9_25 wine)
 add_importlibs(d3dx9_25 d3dx9_30 msvcrt kernel32 ntdll)
--- a/dll/directx/wine/d3dx9_26/CMakeLists.txt
+++ b/dll/directx/wine/d3dx9_26/CMakeLists.txt
@ -8,7 +8,7 @@ list(APPEND SOURCE
    ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_26_stubs.c
    ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_26.def)

-add_library(d3dx9_26 SHARED ${SOURCE} version.rc)
+add_library(d3dx9_26 MODULE ${SOURCE} version.rc)
 set_module_type(d3dx9_26 win32dll)
 target_link_libraries(d3dx9_26 wine)
 add_importlibs(d3dx9_26 d3dx9_30 msvcrt kernel32 ntdll)
--- a/dll/directx/wine/d3dx9_27/CMakeLists.txt
+++ b/dll/directx/wine/d3dx9_27/CMakeLists.txt
@ -8,7 +8,7 @@ list(APPEND SOURCE
    ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_27_stubs.c
    ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_27.def)

-add_library(d3dx9_27 SHARED ${SOURCE} version.rc)
+add_library(d3dx9_27 MODULE ${SOURCE} version.rc)
 set_module_type(d3dx9_27 win32dll)
 target_link_libraries(d3dx9_27 wine)
 add_importlibs(d3dx9_27 d3dx9_30 msvcrt kernel32 ntdll)
--- a/dll/directx/wine/d3dx9_28/CMakeLists.txt
+++ b/dll/directx/wine/d3dx9_28/CMakeLists.txt
@ -8,7 +8,7 @@ list(APPEND SOURCE
    ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_28_stubs.c
    ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_28.def)

-add_library(d3dx9_28 SHARED ${SOURCE} version.rc)
+add_library(d3dx9_28 MODULE ${SOURCE} version.rc)
 set_module_type(d3dx9_28 win32dll)
 target_link_libraries(d3dx9_28 wine)
 add_importlibs(d3dx9_28 d3dx9_30 msvcrt kernel32 ntdll)
--- a/dll/directx/wine/d3dx9_29/CMakeLists.txt
+++ b/dll/directx/wine/d3dx9_29/CMakeLists.txt
@ -8,7 +8,7 @@ list(APPEND SOURCE
    ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_29_stubs.c
    ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_29.def)

-add_library(d3dx9_29 SHARED ${SOURCE} version.rc)
+add_library(d3dx9_29 MODULE ${SOURCE} version.rc)
 set_module_type(d3dx9_29 win32dll)
 target_link_libraries(d3dx9_29 wine)
 add_importlibs(d3dx9_29 d3dx9_30 msvcrt kernel32 ntdll)
--- a/dll/directx/wine/d3dx9_30/CMakeLists.txt
+++ b/dll/directx/wine/d3dx9_30/CMakeLists.txt
@ -8,7 +8,7 @@ list(APPEND SOURCE
    ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_30_stubs.c
    ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_30.def)

-add_library(d3dx9_30 SHARED ${SOURCE} version.rc)
+add_library(d3dx9_30 MODULE ${SOURCE} version.rc)
 set_module_type(d3dx9_30 win32dll)
 target_link_libraries(d3dx9_30 wine)
 add_importlibs(d3dx9_30 d3dx9_36 msvcrt kernel32 ntdll)
--- a/dll/directx/wine/d3dx9_31/CMakeLists.txt
+++ b/dll/directx/wine/d3dx9_31/CMakeLists.txt
@ -8,7 +8,7 @@ list(APPEND SOURCE
    ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_31_stubs.c
    ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_31.def)

-add_library(d3dx9_31 SHARED ${SOURCE} version.rc)
+add_library(d3dx9_31 MODULE ${SOURCE} version.rc)
 set_module_type(d3dx9_31 win32dll)
 target_link_libraries(d3dx9_31 wine)
 add_importlibs(d3dx9_31 d3dx9_36 msvcrt kernel32 ntdll)
--- a/dll/directx/wine/d3dx9_32/CMakeLists.txt
+++ b/dll/directx/wine/d3dx9_32/CMakeLists.txt
@ -8,7 +8,7 @@ list(APPEND SOURCE
    ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_32_stubs.c
    ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_32.def)

-add_library(d3dx9_32 SHARED ${SOURCE} version.rc)
+add_library(d3dx9_32 MODULE ${SOURCE} version.rc)
 set_module_type(d3dx9_32 win32dll)
 target_link_libraries(d3dx9_32 wine)
 add_importlibs(d3dx9_32 d3dx9_36 msvcrt kernel32 ntdll)
--- a/dll/directx/wine/d3dx9_33/CMakeLists.txt
+++ b/dll/directx/wine/d3dx9_33/CMakeLists.txt
@ -8,7 +8,7 @@ list(APPEND SOURCE
    ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_33_stubs.c
    ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_33.def)

-add_library(d3dx9_33 SHARED ${SOURCE} version.rc)
+add_library(d3dx9_33 MODULE ${SOURCE} version.rc)
 set_module_type(d3dx9_33 win32dll)
 target_link_libraries(d3dx9_33 wine)
 add_importlibs(d3dx9_33 d3dx9_36 msvcrt kernel32 ntdll)
--- a/dll/directx/wine/d3dx9_34/CMakeLists.txt
+++ b/dll/directx/wine/d3dx9_34/CMakeLists.txt
@ -8,7 +8,7 @@ list(APPEND SOURCE
    ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_34_stubs.c
    ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_34.def)

-add_library(d3dx9_34 SHARED ${SOURCE} version.rc)
+add_library(d3dx9_34 MODULE ${SOURCE} version.rc)
 set_module_type(d3dx9_34 win32dll)
 target_link_libraries(d3dx9_34 wine)
 add_importlibs(d3dx9_34 d3dx9_36 msvcrt kernel32 ntdll)
--- a/dll/directx/wine/d3dx9_35/CMakeLists.txt
+++ b/dll/directx/wine/d3dx9_35/CMakeLists.txt
@ -7,7 +7,7 @@ list(APPEND SOURCE
    d3dx9_35_main.c
    ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_35.def)

-add_library(d3dx9_35 SHARED ${SOURCE} version.rc)
+add_library(d3dx9_35 MODULE ${SOURCE} version.rc)
 set_module_type(d3dx9_35 win32dll)
 target_link_libraries(d3dx9_35 wine)
 add_importlibs(d3dx9_35 d3dx9_36 msvcrt kernel32 ntdll)
--- a/dll/directx/wine/d3dx9_36/CMakeLists.txt
+++ b/dll/directx/wine/d3dx9_36/CMakeLists.txt
@ -24,7 +24,7 @@ list(APPEND SOURCE
    xfile.c
    precomp.h)

-add_library(d3dx9_36 SHARED
+add_library(d3dx9_36 MODULE
    ${SOURCE}
    guid.c
    version.rc
--- a/dll/directx/wine/d3dx9_37/CMakeLists.txt
+++ b/dll/directx/wine/d3dx9_37/CMakeLists.txt
@ -7,7 +7,7 @@ list(APPEND SOURCE
    d3dx9_37_main.c
    ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_37.def)

-add_library(d3dx9_37 SHARED ${SOURCE} version.rc)
+add_library(d3dx9_37 MODULE ${SOURCE} version.rc)
 set_module_type(d3dx9_37 win32dll)
 target_link_libraries(d3dx9_37 wine)
 add_importlibs(d3dx9_37 d3dx9_36 msvcrt kernel32 ntdll)
--- a/dll/directx/wine/d3dx9_38/CMakeLists.txt
+++ b/dll/directx/wine/d3dx9_38/CMakeLists.txt
@ -7,7 +7,7 @@ list(APPEND SOURCE
    d3dx9_38_main.c
    ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_38.def)

-add_library(d3dx9_38 SHARED ${SOURCE} version.rc)
+add_library(d3dx9_38 MODULE ${SOURCE} version.rc)
 set_module_type(d3dx9_38 win32dll)
 target_link_libraries(d3dx9_38 wine)
 add_importlibs(d3dx9_38 d3dx9_36 msvcrt kernel32 ntdll)
--- a/dll/directx/wine/d3dx9_39/CMakeLists.txt
+++ b/dll/directx/wine/d3dx9_39/CMakeLists.txt
@ -7,7 +7,7 @@ list(APPEND SOURCE
    d3dx9_39_main.c
    ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_39.def)

-add_library(d3dx9_39 SHARED ${SOURCE} version.rc)
+add_library(d3dx9_39 MODULE ${SOURCE} version.rc)
 set_module_type(d3dx9_39 win32dll)
 target_link_libraries(d3dx9_39 wine)
 add_importlibs(d3dx9_39 d3dx9_36 msvcrt kernel32 ntdll)
--- a/dll/directx/wine/d3dx9_40/CMakeLists.txt
+++ b/dll/directx/wine/d3dx9_40/CMakeLists.txt
@ -7,7 +7,7 @@ list(APPEND SOURCE
    d3dx9_40_main.c
    ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_40.def)

-add_library(d3dx9_40 SHARED ${SOURCE} version.rc)
+add_library(d3dx9_40 MODULE ${SOURCE} version.rc)
 set_module_type(d3dx9_40 win32dll)
 target_link_libraries(d3dx9_40 wine)
 add_importlibs(d3dx9_40 d3dx9_36 msvcrt kernel32 ntdll)
--- a/dll/directx/wine/d3dx9_41/CMakeLists.txt
+++ b/dll/directx/wine/d3dx9_41/CMakeLists.txt
@ -7,7 +7,7 @@ list(APPEND SOURCE
    d3dx9_41_main.c
    ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_41.def)

-add_library(d3dx9_41 SHARED ${SOURCE} version.rc)
+add_library(d3dx9_41 MODULE ${SOURCE} version.rc)
 set_module_type(d3dx9_41 win32dll)
 target_link_libraries(d3dx9_41 wine)
 add_importlibs(d3dx9_41 d3dx9_36 msvcrt kernel32 ntdll)
--- a/dll/directx/wine/d3dx9_42/CMakeLists.txt
+++ b/dll/directx/wine/d3dx9_42/CMakeLists.txt
@ -7,7 +7,7 @@ list(APPEND SOURCE
    d3dx9_42_main.c
    ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_42.def)

-add_library(d3dx9_42 SHARED ${SOURCE} version.rc)
+add_library(d3dx9_42 MODULE ${SOURCE} version.rc)
 set_module_type(d3dx9_42 win32dll)
 target_link_libraries(d3dx9_42 wine)
 add_importlibs(d3dx9_42 d3dx9_36 msvcrt kernel32 ntdll)
--- a/dll/directx/wine/d3dx9_43/CMakeLists.txt
+++ b/dll/directx/wine/d3dx9_43/CMakeLists.txt
@ -7,7 +7,7 @@ list(APPEND SOURCE
    d3dx9_43_main.c
    ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_43.def)

-add_library(d3dx9_43 SHARED ${SOURCE} version.rc)
+add_library(d3dx9_43 MODULE ${SOURCE} version.rc)
 set_module_type(d3dx9_43 win32dll)
 add_importlibs(d3dx9_43 d3dx9_36 msvcrt kernel32)
 add_cd_file(TARGET d3dx9_43 DESTINATION reactos/system32 FOR all)
--- a/dll/directx/wine/d3dxof/CMakeLists.txt
+++ b/dll/directx/wine/d3dxof/CMakeLists.txt
@ -9,7 +9,7 @@ list(APPEND SOURCE
    parsing.c
    precomp.h)

-add_library(d3dxof SHARED
+add_library(d3dxof MODULE
    ${SOURCE}
    mszip.c
    version.rc
--- a/dll/directx/wine/ddraw/CMakeLists.txt
+++ b/dll/directx/wine/ddraw/CMakeLists.txt
@ -29,7 +29,7 @@ if(MSVC)
    set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "/FIwine/typeof.h")
 endif()

-add_library(ddraw SHARED
+add_library(ddraw MODULE
    ${SOURCE}
    ddraw.rc
    ${CMAKE_CURRENT_BINARY_DIR}/ddraw.def)
--- a/dll/directx/wine/devenum/CMakeLists.txt
+++ b/dll/directx/wine/devenum/CMakeLists.txt
@ -15,7 +15,7 @@ list(APPEND SOURCE
    parsedisplayname.c
    precomp.h)

-add_library(devenum SHARED
+add_library(devenum MODULE
    ${SOURCE}
    devenum.rc
    ${CMAKE_CURRENT_BINARY_DIR}/devenum.def)
--- a/dll/directx/wine/dinput/CMakeLists.txt
+++ b/dll/directx/wine/dinput/CMakeLists.txt
@ -16,7 +16,7 @@ list(APPEND SOURCE
    mouse.c
    precomp.h)

-add_library(dinput SHARED
+add_library(dinput MODULE
    ${SOURCE}
    data_formats.c
    dinput.rc
--- a/dll/directx/wine/dinput8/CMakeLists.txt
+++ b/dll/directx/wine/dinput8/CMakeLists.txt
@ -7,7 +7,7 @@ list(APPEND SOURCE
    dinput8_main.c
    ${CMAKE_CURRENT_BINARY_DIR}/dinput8.def)

-add_library(dinput8 SHARED ${SOURCE} version.rc)
+add_library(dinput8 MODULE ${SOURCE} version.rc)
 set_module_type(dinput8 win32dll)
 target_link_libraries(dinput8 dxguid uuid wine)
 add_importlibs(dinput8 ole32 msvcrt kernel32 ntdll)
--- a/dll/directx/wine/dmusic/CMakeLists.txt
+++ b/dll/directx/wine/dmusic/CMakeLists.txt
@ -15,7 +15,7 @@ list(APPEND SOURCE
    port.c
    precomp.h)

-add_library(dmusic SHARED
+add_library(dmusic MODULE
    ${SOURCE}
    version.rc
    ${CMAKE_CURRENT_BINARY_DIR}/dmusic.def)
--- a/dll/directx/wine/dplay/CMakeLists.txt
+++ b/dll/directx/wine/dplay/CMakeLists.txt
@ -2,7 +2,7 @@
 include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
 spec2def(dplay.dll dplay.spec)

-add_library(dplay SHARED
+add_library(dplay MODULE
    version.rc
    ${CMAKE_CURRENT_BINARY_DIR}/dplay_stubs.c
    ${CMAKE_CURRENT_BINARY_DIR}/dplay.def)
--- a/dll/directx/wine/dplayx/CMakeLists.txt
+++ b/dll/directx/wine/dplayx/CMakeLists.txt
@ -18,7 +18,7 @@ list(APPEND SOURCE
    name_server.c
    precomp.h)

-add_library(dplayx SHARED
+add_library(dplayx MODULE
    ${SOURCE}
    version.rc
    ${CMAKE_CURRENT_BINARY_DIR}/dplayx.def)
--- a/dll/directx/wine/dsound/CMakeLists.txt
+++ b/dll/directx/wine/dsound/CMakeLists.txt
@ -7,7 +7,7 @@ add_definitions(
 include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
 spec2def(dsound.dll dsound.spec ADD_IMPORTLIB)

-add_library(dsound SHARED
+add_library(dsound MODULE
    buffer.c
    capture.c
    dsound.c
--- a/dll/directx/wine/dxdiagn/CMakeLists.txt
+++ b/dll/directx/wine/dxdiagn/CMakeLists.txt
@ -10,7 +10,7 @@ list(APPEND SOURCE
    provider.c
    precomp.h)

-add_library(dxdiagn SHARED
+add_library(dxdiagn MODULE
    ${SOURCE}
    guid.c
    dxdiagn.rc
--- a/dll/directx/wine/msdmo/CMakeLists.txt
+++ b/dll/directx/wine/msdmo/CMakeLists.txt
@ -8,7 +8,7 @@ list(APPEND SOURCE
    dmort.c
    precomp.h)

-add_library(msdmo SHARED
+add_library(msdmo MODULE
    ${SOURCE}
    stubs.c
    rsrc.rc
--- a/dll/directx/wine/qedit/CMakeLists.txt
+++ b/dll/directx/wine/qedit/CMakeLists.txt
@ -10,7 +10,7 @@ list(APPEND SOURCE
    timeline.c
    precomp.h)

-add_library(qedit SHARED
+add_library(qedit MODULE
    ${SOURCE}
    qedit.rc
    ${CMAKE_CURRENT_BINARY_DIR}/qedit.def)
--- a/dll/directx/wine/quartz/CMakeLists.txt
+++ b/dll/directx/wine/quartz/CMakeLists.txt
@ -37,7 +37,7 @@ list(APPEND SOURCE
    waveparser.c
    precomp.h)

-add_library(quartz SHARED
+add_library(quartz MODULE
    ${SOURCE}
    ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c
    ${CMAKE_CURRENT_BINARY_DIR}/quartz_strmif_p.c
--- a/dll/directx/wine/wined3d/CMakeLists.txt
+++ b/dll/directx/wine/wined3d/CMakeLists.txt
@ -41,7 +41,7 @@ list(APPEND SOURCE
    wined3d_main.c
    precomp.h)

-add_library(d3dwine SHARED
+add_library(d3dwine MODULE
    ${SOURCE}
    version.rc
    ${CMAKE_CURRENT_BINARY_DIR}/d3dwine.def)
--- a/dll/keyboard/CMakeLists.txt
+++ b/dll/keyboard/CMakeLists.txt
@ -86,7 +86,7 @@ list(APPEND _keyboard_layouts
 foreach(_keyboard_layout ${_keyboard_layouts})
    spec2def(${_keyboard_layout}.dll ${_keyboard_layout}/${_keyboard_layout}.spec)

-    add_library(${_keyboard_layout} SHARED
+    add_library(${_keyboard_layout} MODULE
        ${_keyboard_layout}/${_keyboard_layout}.c
        ${_keyboard_layout}/${_keyboard_layout}.rc
        ${CMAKE_CURRENT_BINARY_DIR}/${_keyboard_layout}.def)
--- a/dll/nls/idndl/CMakeLists.txt
+++ b/dll/nls/idndl/CMakeLists.txt
@ -4,7 +4,7 @@ add_definitions(-DWINVER=0x600)

 spec2def(idndl.dll idndl.spec)

-add_library(idndl SHARED
+add_library(idndl MODULE
    idndl.cpp
    ${CMAKE_CURRENT_BINARY_DIR}/idndl.def)

--- a/dll/nls/normaliz/CMakeLists.txt
+++ b/dll/nls/normaliz/CMakeLists.txt
@ -11,7 +11,7 @@ list(APPEND SOURCE
    normalize.c
    ${CMAKE_CURRENT_BINARY_DIR}/normaliz.def)
    
-add_library(normaliz SHARED ${SOURCE})
+add_library(normaliz MODULE ${SOURCE})
 set_module_type(normaliz win32dll ENTRYPOINT 0)
 add_importlibs(normaliz msvcrt kernel32 ntdll)
 add_cd_file(TARGET normaliz DESTINATION reactos/system32 FOR all)
--- a/dll/np/nfs/CMakeLists.txt
+++ b/dll/np/nfs/CMakeLists.txt
@ -11,7 +11,7 @@ list(APPEND SOURCE
 include_directories(
    ${REACTOS_SOURCE_DIR}/drivers/filesystems/nfs)

-add_library(nfs41_np SHARED
+add_library(nfs41_np MODULE
    ${SOURCE}
    nfsnp.rc
    ${CMAKE_CURRENT_BINARY_DIR}/nfs41_np.def)
--- a/dll/ntdll/CMakeLists.txt
+++ b/dll/ntdll/CMakeLists.txt
@ -38,7 +38,7 @@ endif()

 add_asm_files(ntdll_asm ${ASM_SOURCE})

-add_library(ntdll SHARED
+add_library(ntdll MODULE
    ${SOURCE}
    ${ntdll_asm}
    def/ntdll.rc
--- a/dll/opengl/glu32/CMakeLists.txt
+++ b/dll/opengl/glu32/CMakeLists.txt
@ -110,7 +110,7 @@ list(APPEND LIBNURBS_SOURCE
    src/libnurbs/nurbtess/searchTree.cc
    precomp.h)

-add_library(glu32 SHARED
+add_library(glu32 MODULE
    ${LIBNURBS_SOURCE}
    src/libnurbs/nurbtess/polyDBG.cc
    ${SOURCE}
--- a/dll/opengl/opengl32/CMakeLists.txt
+++ b/dll/opengl/opengl32/CMakeLists.txt
@ -32,7 +32,7 @@ if(ARCH STREQUAL "i386")
    )
 endif()

-add_library(opengl32 SHARED
+add_library(opengl32 MODULE
    ${SOURCE}
    ${opengl32_asm}
    ${CMAKE_CURRENT_BINARY_DIR}/opengl32.def)
--- a/dll/shellext/acppage/CMakeLists.txt
+++ b/dll/shellext/acppage/CMakeLists.txt
@ -22,7 +22,7 @@ list(APPEND SOURCE
    CLayerUIPropPage.cpp
    precomp.h)

-add_library(acppage SHARED
+add_library(acppage MODULE
    ${SOURCE}
    acppage.spec
    ACPPage.rc
--- a/dll/shellext/cryptext/CMakeLists.txt
+++ b/dll/shellext/cryptext/CMakeLists.txt
@ -5,7 +5,7 @@ list(APPEND SOURCE
    cryptext.c
    precomp.h)

-add_library(cryptext SHARED
+add_library(cryptext MODULE
    ${SOURCE}
    cryptext.spec
    cryptext.rc
--- a/dll/shellext/deskadp/CMakeLists.txt
+++ b/dll/shellext/deskadp/CMakeLists.txt
@ -8,7 +8,7 @@ list(APPEND SOURCE

 add_rc_deps(deskadp.rc ${CMAKE_CURRENT_SOURCE_DIR}/resources/adapter.ico)

-add_library(deskadp SHARED
+add_library(deskadp MODULE
    ${SOURCE}
    deskadp.rc
    ${CMAKE_CURRENT_BINARY_DIR}/deskadp.def)
--- a/Show More
+++ b/Show More