6 Apr
2019
6 Apr
'19
3:43 p.m.
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=23373acbb9b5356422657…
commit 23373acbb9b5356422657fa8448d2a18270847e2
Author: Jérôme Gardou <jerome.gardou(a)reactos.org>
AuthorDate: Wed Mar 20 14:19:48 2019 +0100
Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com>
CommitDate: Sat Apr 6 17:43:38 2019 +0200
[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.
---
CMakeLists.txt | 1 +
base/applications/charmap_new/CMakeLists.txt | 2 +-
base/applications/kbswitch/kbsdll/CMakeLists.txt | 2 +-
base/applications/regedit/clb/CMakeLists.txt | 2 +-
base/services/dcomlaunch/CMakeLists.txt | 2 +-
base/services/dhcpcsvc/CMakeLists.txt | 2 +-
base/services/schedsvc/CMakeLists.txt | 2 +-
base/services/shsvcs/CMakeLists.txt | 2 +-
base/services/srvsvc/CMakeLists.txt | 2 +-
base/services/umpnpmgr/CMakeLists.txt | 2 +-
base/services/wkssvc/CMakeLists.txt | 2 +-
base/services/wmisvc/CMakeLists.txt | 2 +-
base/services/wuauserv/CMakeLists.txt | 2 +-
base/shell/rshell/CMakeLists.txt | 2 +-
dll/3rdparty/dxtn/CMakeLists.txt | 2 +-
dll/3rdparty/libjpeg/CMakeLists.txt | 2 +-
dll/3rdparty/libpng/CMakeLists.txt | 2 +-
dll/3rdparty/libtiff/CMakeLists.txt | 2 +-
dll/3rdparty/libtirpc/CMakeLists.txt | 2 +-
dll/3rdparty/libxslt/CMakeLists.txt | 2 +-
dll/3rdparty/mbedtls/CMakeLists.txt | 2 +-
dll/apisets/CMakeLists.txt | 2 +-
dll/appcompat/apphelp/CMakeLists.txt | 2 +-
dll/appcompat/shims/genral/CMakeLists.txt | 2 +-
dll/appcompat/shims/layer/CMakeLists.txt | 2 +-
dll/cpl/access/CMakeLists.txt | 2 +-
dll/cpl/appwiz/CMakeLists.txt | 2 +-
dll/cpl/console/CMakeLists.txt | 2 +-
dll/cpl/desk/CMakeLists.txt | 2 +-
dll/cpl/hdwwiz/CMakeLists.txt | 2 +-
dll/cpl/hotplug/CMakeLists.txt | 2 +-
dll/cpl/inetcpl/CMakeLists.txt | 2 +-
dll/cpl/input/CMakeLists.txt | 2 +-
dll/cpl/intl/CMakeLists.txt | 2 +-
dll/cpl/joy/CMakeLists.txt | 2 +-
dll/cpl/liccpa/CMakeLists.txt | 2 +-
dll/cpl/main/CMakeLists.txt | 2 +-
dll/cpl/mmsys/CMakeLists.txt | 2 +-
dll/cpl/ncpa/CMakeLists.txt | 2 +-
dll/cpl/odbccp32/CMakeLists.txt | 2 +-
dll/cpl/openglcfg/CMakeLists.txt | 2 +-
dll/cpl/powercfg/CMakeLists.txt | 2 +-
dll/cpl/sysdm/CMakeLists.txt | 2 +-
dll/cpl/telephon/CMakeLists.txt | 2 +-
dll/cpl/timedate/CMakeLists.txt | 2 +-
dll/cpl/usrmgr/CMakeLists.txt | 2 +-
dll/cpl/wined3dcfg/CMakeLists.txt | 2 +-
dll/directx/d3d8thk/CMakeLists.txt | 2 +-
dll/directx/ddraw/CMakeLists.txt | 2 +-
dll/directx/ksproxy/CMakeLists.txt | 2 +-
dll/directx/ksuser/CMakeLists.txt | 2 +-
dll/directx/wine/amstream/CMakeLists.txt | 2 +-
dll/directx/wine/d3d8/CMakeLists.txt | 2 +-
dll/directx/wine/d3d9/CMakeLists.txt | 2 +-
dll/directx/wine/d3dcompiler_43/CMakeLists.txt | 2 +-
dll/directx/wine/d3drm/CMakeLists.txt | 2 +-
dll/directx/wine/d3dx9_24/CMakeLists.txt | 2 +-
dll/directx/wine/d3dx9_25/CMakeLists.txt | 2 +-
dll/directx/wine/d3dx9_26/CMakeLists.txt | 2 +-
dll/directx/wine/d3dx9_27/CMakeLists.txt | 2 +-
dll/directx/wine/d3dx9_28/CMakeLists.txt | 2 +-
dll/directx/wine/d3dx9_29/CMakeLists.txt | 2 +-
dll/directx/wine/d3dx9_30/CMakeLists.txt | 2 +-
dll/directx/wine/d3dx9_31/CMakeLists.txt | 2 +-
dll/directx/wine/d3dx9_32/CMakeLists.txt | 2 +-
dll/directx/wine/d3dx9_33/CMakeLists.txt | 2 +-
dll/directx/wine/d3dx9_34/CMakeLists.txt | 2 +-
dll/directx/wine/d3dx9_35/CMakeLists.txt | 2 +-
dll/directx/wine/d3dx9_36/CMakeLists.txt | 2 +-
dll/directx/wine/d3dx9_37/CMakeLists.txt | 2 +-
dll/directx/wine/d3dx9_38/CMakeLists.txt | 2 +-
dll/directx/wine/d3dx9_39/CMakeLists.txt | 2 +-
dll/directx/wine/d3dx9_40/CMakeLists.txt | 2 +-
dll/directx/wine/d3dx9_41/CMakeLists.txt | 2 +-
dll/directx/wine/d3dx9_42/CMakeLists.txt | 2 +-
dll/directx/wine/d3dx9_43/CMakeLists.txt | 2 +-
dll/directx/wine/d3dxof/CMakeLists.txt | 2 +-
dll/directx/wine/ddraw/CMakeLists.txt | 2 +-
dll/directx/wine/devenum/CMakeLists.txt | 2 +-
dll/directx/wine/dinput/CMakeLists.txt | 2 +-
dll/directx/wine/dinput8/CMakeLists.txt | 2 +-
dll/directx/wine/dmusic/CMakeLists.txt | 2 +-
dll/directx/wine/dplay/CMakeLists.txt | 2 +-
dll/directx/wine/dplayx/CMakeLists.txt | 2 +-
dll/directx/wine/dsound/CMakeLists.txt | 2 +-
dll/directx/wine/dxdiagn/CMakeLists.txt | 2 +-
dll/directx/wine/msdmo/CMakeLists.txt | 2 +-
dll/directx/wine/qedit/CMakeLists.txt | 2 +-
dll/directx/wine/quartz/CMakeLists.txt | 2 +-
dll/directx/wine/wined3d/CMakeLists.txt | 2 +-
dll/keyboard/CMakeLists.txt | 2 +-
dll/nls/idndl/CMakeLists.txt | 2 +-
dll/nls/normaliz/CMakeLists.txt | 2 +-
dll/np/nfs/CMakeLists.txt | 2 +-
dll/ntdll/CMakeLists.txt | 2 +-
dll/opengl/glu32/CMakeLists.txt | 2 +-
dll/opengl/opengl32/CMakeLists.txt | 2 +-
dll/shellext/acppage/CMakeLists.txt | 2 +-
dll/shellext/cryptext/CMakeLists.txt | 2 +-
dll/shellext/deskadp/CMakeLists.txt | 2 +-
dll/shellext/deskmon/CMakeLists.txt | 2 +-
dll/shellext/devcpux/CMakeLists.txt | 2 +-
dll/shellext/fontext/CMakeLists.txt | 2 +-
dll/shellext/netshell/CMakeLists.txt | 2 +-
dll/shellext/ntobjshex/CMakeLists.txt | 2 +-
dll/shellext/shellbtrfs/CMakeLists.txt | 2 +-
dll/shellext/stobject/CMakeLists.txt | 2 +-
dll/shellext/zipfldr/CMakeLists.txt | 2 +-
dll/win32/acledit/CMakeLists.txt | 2 +-
dll/win32/aclui/CMakeLists.txt | 2 +-
dll/win32/activeds/CMakeLists.txt | 2 +-
dll/win32/actxprxy/CMakeLists.txt | 2 +-
dll/win32/advapi32/CMakeLists.txt | 2 +-
dll/win32/advapi32_vista/CMakeLists.txt | 2 +-
dll/win32/advpack/CMakeLists.txt | 2 +-
dll/win32/atl/CMakeLists.txt | 2 +-
dll/win32/atl100/CMakeLists.txt | 2 +-
dll/win32/atl80/CMakeLists.txt | 2 +-
dll/win32/authz/CMakeLists.txt | 2 +-
dll/win32/avicap32/CMakeLists.txt | 2 +-
dll/win32/avifil32/CMakeLists.txt | 2 +-
dll/win32/batt/CMakeLists.txt | 2 +-
dll/win32/bcrypt/CMakeLists.txt | 2 +-
dll/win32/beepmidi/CMakeLists.txt | 2 +-
dll/win32/browseui/CMakeLists.txt | 2 +-
dll/win32/bthci/CMakeLists.txt | 2 +-
dll/win32/cabinet/CMakeLists.txt | 2 +-
dll/win32/cards/CMakeLists.txt | 2 +-
dll/win32/cfgmgr32/CMakeLists.txt | 2 +-
dll/win32/clusapi/CMakeLists.txt | 2 +-
dll/win32/comcat/CMakeLists.txt | 2 +-
dll/win32/comctl32/CMakeLists.txt | 2 +-
dll/win32/comdlg32/CMakeLists.txt | 2 +-
dll/win32/compstui/CMakeLists.txt | 2 +-
dll/win32/credui/CMakeLists.txt | 2 +-
dll/win32/crtdll/CMakeLists.txt | 2 +-
dll/win32/crypt32/CMakeLists.txt | 2 +-
dll/win32/cryptdlg/CMakeLists.txt | 2 +-
dll/win32/cryptdll/CMakeLists.txt | 2 +-
dll/win32/cryptnet/CMakeLists.txt | 2 +-
dll/win32/cryptui/CMakeLists.txt | 2 +-
dll/win32/dbghelp/CMakeLists.txt | 2 +-
dll/win32/dciman32/CMakeLists.txt | 2 +-
dll/win32/devmgr/CMakeLists.txt | 2 +-
dll/win32/dnsapi/CMakeLists.txt | 2 +-
dll/win32/esent/CMakeLists.txt | 2 +-
dll/win32/faultrep/CMakeLists.txt | 2 +-
dll/win32/fltlib/CMakeLists.txt | 2 +-
dll/win32/fmifs/CMakeLists.txt | 2 +-
dll/win32/fontsub/CMakeLists.txt | 2 +-
dll/win32/framedyn/CMakeLists.txt | 2 +-
dll/win32/fusion/CMakeLists.txt | 2 +-
dll/win32/fusion/fusion_1_1/CMakeLists.txt | 2 +-
dll/win32/fusion/fusion_2_0/CMakeLists.txt | 2 +-
dll/win32/gdiplus/CMakeLists.txt | 2 +-
dll/win32/getuname/CMakeLists.txt | 2 +-
dll/win32/hhctrl.ocx/CMakeLists.txt | 2 +-
dll/win32/hid/CMakeLists.txt | 2 +-
dll/win32/hlink/CMakeLists.txt | 2 +-
dll/win32/hnetcfg/CMakeLists.txt | 2 +-
dll/win32/httpapi/CMakeLists.txt | 2 +-
dll/win32/iccvid/CMakeLists.txt | 2 +-
dll/win32/icmp/CMakeLists.txt | 2 +-
dll/win32/ieframe/CMakeLists.txt | 2 +-
dll/win32/iernonce/CMakeLists.txt | 2 +-
dll/win32/imaadp32.acm/CMakeLists.txt | 2 +-
dll/win32/imagehlp/CMakeLists.txt | 2 +-
dll/win32/imm32/CMakeLists.txt | 2 +-
dll/win32/inetcomm/CMakeLists.txt | 2 +-
dll/win32/inetmib1/CMakeLists.txt | 2 +-
dll/win32/initpki/CMakeLists.txt | 2 +-
dll/win32/inseng/CMakeLists.txt | 2 +-
dll/win32/iologmsg/CMakeLists.txt | 2 +-
dll/win32/iphlpapi/CMakeLists.txt | 2 +-
dll/win32/itircl/CMakeLists.txt | 2 +-
dll/win32/itss/CMakeLists.txt | 2 +-
dll/win32/jscript/CMakeLists.txt | 2 +-
dll/win32/jsproxy/CMakeLists.txt | 2 +-
dll/win32/kernel32/CMakeLists.txt | 2 +-
dll/win32/kernel32_vista/CMakeLists.txt | 2 +-
dll/win32/loadperf/CMakeLists.txt | 2 +-
dll/win32/lpk/CMakeLists.txt | 2 +-
dll/win32/lsasrv/CMakeLists.txt | 2 +-
dll/win32/lz32/CMakeLists.txt | 2 +-
dll/win32/mapi32/CMakeLists.txt | 2 +-
dll/win32/mciavi32/CMakeLists.txt | 2 +-
dll/win32/mcicda/CMakeLists.txt | 2 +-
dll/win32/mciqtz32/CMakeLists.txt | 2 +-
dll/win32/mciseq/CMakeLists.txt | 2 +-
dll/win32/mciwave/CMakeLists.txt | 2 +-
dll/win32/mgmtapi/CMakeLists.txt | 2 +-
dll/win32/mlang/CMakeLists.txt | 2 +-
dll/win32/mmdevapi/CMakeLists.txt | 2 +-
dll/win32/mmdrv/CMakeLists.txt | 2 +-
dll/win32/modemui/CMakeLists.txt | 2 +-
dll/win32/mpr/CMakeLists.txt | 2 +-
dll/win32/mprapi/CMakeLists.txt | 2 +-
dll/win32/msacm32.drv/CMakeLists.txt | 2 +-
dll/win32/msacm32/CMakeLists.txt | 2 +-
dll/win32/msadp32.acm/CMakeLists.txt | 2 +-
dll/win32/msafd/CMakeLists.txt | 2 +-
dll/win32/mscat32/CMakeLists.txt | 2 +-
dll/win32/mscms/CMakeLists.txt | 2 +-
dll/win32/mscoree/CMakeLists.txt | 2 +-
dll/win32/msctf/CMakeLists.txt | 2 +-
dll/win32/msftedit/CMakeLists.txt | 2 +-
dll/win32/msg711.acm/CMakeLists.txt | 2 +-
dll/win32/msgina/CMakeLists.txt | 2 +-
dll/win32/msgsm32.acm/CMakeLists.txt | 2 +-
dll/win32/mshtml.tlb/CMakeLists.txt | 2 +-
dll/win32/mshtml/CMakeLists.txt | 2 +-
dll/win32/msi/CMakeLists.txt | 2 +-
dll/win32/msimg32/CMakeLists.txt | 2 +-
dll/win32/msimtf/CMakeLists.txt | 2 +-
dll/win32/msisip/CMakeLists.txt | 2 +-
dll/win32/msisys.ocx/CMakeLists.txt | 2 +-
dll/win32/msnet32/CMakeLists.txt | 2 +-
dll/win32/mspatcha/CMakeLists.txt | 2 +-
dll/win32/msports/CMakeLists.txt | 2 +-
dll/win32/msrle32/CMakeLists.txt | 2 +-
dll/win32/mssign32/CMakeLists.txt | 2 +-
dll/win32/mssip32/CMakeLists.txt | 2 +-
dll/win32/mstask/CMakeLists.txt | 2 +-
dll/win32/msv1_0/CMakeLists.txt | 2 +-
dll/win32/msvcrt/CMakeLists.txt | 2 +-
dll/win32/msvcrt20/CMakeLists.txt | 2 +-
dll/win32/msvcrt40/CMakeLists.txt | 2 +-
dll/win32/msvfw32/CMakeLists.txt | 2 +-
dll/win32/msvidc32/CMakeLists.txt | 2 +-
dll/win32/mswsock/CMakeLists.txt | 2 +-
dll/win32/msxml/CMakeLists.txt | 2 +-
dll/win32/msxml2/CMakeLists.txt | 2 +-
dll/win32/msxml3/CMakeLists.txt | 2 +-
dll/win32/msxml4/CMakeLists.txt | 2 +-
dll/win32/msxml6/CMakeLists.txt | 2 +-
dll/win32/mycomput/CMakeLists.txt | 2 +-
dll/win32/nddeapi/CMakeLists.txt | 2 +-
dll/win32/netapi32/CMakeLists.txt | 2 +-
dll/win32/netcfgx/CMakeLists.txt | 2 +-
dll/win32/netevent/CMakeLists.txt | 2 +-
dll/win32/netid/CMakeLists.txt | 2 +-
dll/win32/netmsg/CMakeLists.txt | 2 +-
dll/win32/newdev/CMakeLists.txt | 2 +-
dll/win32/npptools/CMakeLists.txt | 2 +-
dll/win32/ntdll_vista/CMakeLists.txt | 2 +-
dll/win32/ntdsapi/CMakeLists.txt | 2 +-
dll/win32/ntlanman/CMakeLists.txt | 2 +-
dll/win32/ntmarta/CMakeLists.txt | 2 +-
dll/win32/objsel/CMakeLists.txt | 2 +-
dll/win32/odbc32/CMakeLists.txt | 2 +-
dll/win32/odbccp32/CMakeLists.txt | 2 +-
dll/win32/ole32/CMakeLists.txt | 2 +-
dll/win32/oleacc/CMakeLists.txt | 2 +-
dll/win32/oleaut32/CMakeLists.txt | 2 +-
dll/win32/olecli32/CMakeLists.txt | 2 +-
dll/win32/oledlg/CMakeLists.txt | 2 +-
dll/win32/olepro32/CMakeLists.txt | 2 +-
dll/win32/olesvr32/CMakeLists.txt | 2 +-
dll/win32/olethk32/CMakeLists.txt | 2 +-
dll/win32/pdh/CMakeLists.txt | 2 +-
dll/win32/pidgen/CMakeLists.txt | 2 +-
dll/win32/powrprof/CMakeLists.txt | 2 +-
dll/win32/printui/CMakeLists.txt | 2 +-
dll/win32/propsys/CMakeLists.txt | 2 +-
dll/win32/psapi/CMakeLists.txt | 2 +-
dll/win32/pstorec/CMakeLists.txt | 2 +-
dll/win32/qmgr/CMakeLists.txt | 2 +-
dll/win32/qmgrprxy/CMakeLists.txt | 2 +-
dll/win32/query/CMakeLists.txt | 2 +-
dll/win32/rasadhlp/CMakeLists.txt | 2 +-
dll/win32/rasapi32/CMakeLists.txt | 2 +-
dll/win32/rasdlg/CMakeLists.txt | 2 +-
dll/win32/rasman/CMakeLists.txt | 2 +-
dll/win32/resutils/CMakeLists.txt | 2 +-
dll/win32/riched20/CMakeLists.txt | 2 +-
dll/win32/riched32/CMakeLists.txt | 2 +-
dll/win32/rpcrt4/CMakeLists.txt | 2 +-
dll/win32/rsabase/CMakeLists.txt | 2 +-
dll/win32/rsaenh/CMakeLists.txt | 2 +-
dll/win32/samlib/CMakeLists.txt | 2 +-
dll/win32/samsrv/CMakeLists.txt | 2 +-
dll/win32/sccbase/CMakeLists.txt | 2 +-
dll/win32/schannel/CMakeLists.txt | 2 +-
dll/win32/scrrun/CMakeLists.txt | 2 +-
dll/win32/secur32/CMakeLists.txt | 2 +-
dll/win32/security/CMakeLists.txt | 2 +-
dll/win32/sensapi/CMakeLists.txt | 2 +-
dll/win32/serialui/CMakeLists.txt | 2 +-
dll/win32/setupapi/CMakeLists.txt | 2 +-
dll/win32/sfc/CMakeLists.txt | 2 +-
dll/win32/sfc_os/CMakeLists.txt | 2 +-
dll/win32/shdoclc/CMakeLists.txt | 2 +-
dll/win32/shdocvw/CMakeLists.txt | 2 +-
dll/win32/shell32/CMakeLists.txt | 2 +-
dll/win32/shfolder/CMakeLists.txt | 2 +-
dll/win32/shimgvw/CMakeLists.txt | 2 +-
dll/win32/shlwapi/CMakeLists.txt | 2 +-
dll/win32/slbcsp/CMakeLists.txt | 2 +-
dll/win32/smdll/CMakeLists.txt | 2 +-
dll/win32/sndblst/CMakeLists.txt | 2 +-
dll/win32/snmpapi/CMakeLists.txt | 2 +-
dll/win32/softpub/CMakeLists.txt | 2 +-
dll/win32/srclient/CMakeLists.txt | 2 +-
dll/win32/stdole2.tlb/CMakeLists.txt | 2 +-
dll/win32/stdole32.tlb/CMakeLists.txt | 2 +-
dll/win32/sti/CMakeLists.txt | 2 +-
dll/win32/streamci/CMakeLists.txt | 2 +-
dll/win32/sxs/CMakeLists.txt | 2 +-
dll/win32/syssetup/CMakeLists.txt | 2 +-
dll/win32/t2embed/CMakeLists.txt | 2 +-
dll/win32/tapi32/CMakeLists.txt | 2 +-
dll/win32/tapiui/CMakeLists.txt | 2 +-
dll/win32/themeui/CMakeLists.txt | 2 +-
dll/win32/traffic/CMakeLists.txt | 2 +-
dll/win32/twain_32/CMakeLists.txt | 2 +-
dll/win32/ubtrfs/CMakeLists.txt | 2 +-
dll/win32/ucdfs/CMakeLists.txt | 2 +-
dll/win32/uext2/CMakeLists.txt | 2 +-
dll/win32/ufat/CMakeLists.txt | 2 +-
dll/win32/ufatx/CMakeLists.txt | 2 +-
dll/win32/uffs/CMakeLists.txt | 2 +-
dll/win32/untfs/CMakeLists.txt | 2 +-
dll/win32/updspapi/CMakeLists.txt | 2 +-
dll/win32/ureiserfs/CMakeLists.txt | 2 +-
dll/win32/url/CMakeLists.txt | 2 +-
dll/win32/urlmon/CMakeLists.txt | 2 +-
dll/win32/userenv/CMakeLists.txt | 2 +-
dll/win32/usp10/CMakeLists.txt | 2 +-
dll/win32/uxtheme/CMakeLists.txt | 2 +-
dll/win32/vbscript/CMakeLists.txt | 2 +-
dll/win32/verifier/CMakeLists.txt | 2 +-
dll/win32/version/CMakeLists.txt | 2 +-
dll/win32/vssapi/CMakeLists.txt | 2 +-
dll/win32/wbemdisp/CMakeLists.txt | 2 +-
dll/win32/wbemprox/CMakeLists.txt | 2 +-
dll/win32/wdmaud.drv/CMakeLists.txt | 2 +-
dll/win32/windowscodecs/CMakeLists.txt | 2 +-
dll/win32/windowscodecsext/CMakeLists.txt | 2 +-
dll/win32/winemp3.acm/CMakeLists.txt | 2 +-
dll/win32/winfax/CMakeLists.txt | 2 +-
dll/win32/wing32/CMakeLists.txt | 2 +-
dll/win32/winhttp/CMakeLists.txt | 2 +-
dll/win32/wininet/CMakeLists.txt | 2 +-
dll/win32/winmm/CMakeLists.txt | 2 +-
dll/win32/winmm/midimap/CMakeLists.txt | 2 +-
dll/win32/winscard/CMakeLists.txt | 2 +-
dll/win32/winsta/CMakeLists.txt | 2 +-
dll/win32/wintrust/CMakeLists.txt | 2 +-
dll/win32/wlanapi/CMakeLists.txt | 2 +-
dll/win32/wldap32/CMakeLists.txt | 2 +-
dll/win32/wlnotify/CMakeLists.txt | 2 +-
dll/win32/wmi/CMakeLists.txt | 2 +-
dll/win32/wmiutils/CMakeLists.txt | 2 +-
dll/win32/wmvcore/CMakeLists.txt | 2 +-
dll/win32/ws2_32/CMakeLists.txt | 2 +-
dll/win32/ws2help/CMakeLists.txt | 2 +-
dll/win32/wshirda/CMakeLists.txt | 2 +-
dll/win32/wshom.ocx/CMakeLists.txt | 2 +-
dll/win32/wshtcpip/CMakeLists.txt | 2 +-
dll/win32/wsock32/CMakeLists.txt | 2 +-
dll/win32/wtsapi32/CMakeLists.txt | 2 +-
dll/win32/wuapi/CMakeLists.txt | 2 +-
dll/win32/xinput1_1/CMakeLists.txt | 2 +-
dll/win32/xinput1_2/CMakeLists.txt | 2 +-
dll/win32/xinput1_3/CMakeLists.txt | 2 +-
dll/win32/xinput9_1_0/CMakeLists.txt | 2 +-
dll/win32/xmllite/CMakeLists.txt | 2 +-
dll/win32/xolehlp/CMakeLists.txt | 2 +-
drivers/base/beep/CMakeLists.txt | 2 +-
drivers/base/bootvid/CMakeLists.txt | 2 +-
drivers/base/condrv/CMakeLists.txt | 2 +-
drivers/base/kdcom/CMakeLists.txt | 2 +-
drivers/base/kdgdb/CMakeLists.txt | 2 +-
drivers/base/kdrosdbg/CMakeLists.txt | 2 +-
drivers/base/kdvm/CMakeLists.txt | 2 +-
drivers/base/nmidebug/CMakeLists.txt | 2 +-
drivers/base/null/CMakeLists.txt | 2 +-
drivers/battery/battc/CMakeLists.txt | 2 +-
drivers/bluetooth/fbtusb/CMakeLists.txt | 2 +-
drivers/bus/acpi/CMakeLists.txt | 2 +-
drivers/bus/acpi/cmbatt/CMakeLists.txt | 2 +-
drivers/bus/acpi/compbatt/CMakeLists.txt | 2 +-
drivers/bus/isapnp/CMakeLists.txt | 2 +-
drivers/bus/pci/CMakeLists.txt | 2 +-
drivers/bus/pcix/CMakeLists.txt | 2 +-
drivers/bus/pcmcia/CMakeLists.txt | 2 +-
drivers/crypto/ksecdd/CMakeLists.txt | 2 +-
drivers/filesystems/btrfs/CMakeLists.txt | 2 +-
drivers/filesystems/cdfs/CMakeLists.txt | 2 +-
drivers/filesystems/ext2/CMakeLists.txt | 2 +-
drivers/filesystems/fastfat/CMakeLists.txt | 2 +-
drivers/filesystems/fastfat_new/CMakeLists.txt | 2 +-
drivers/filesystems/ffs/CMakeLists.txt | 2 +-
drivers/filesystems/fs_rec/CMakeLists.txt | 2 +-
drivers/filesystems/msfs/CMakeLists.txt | 2 +-
drivers/filesystems/mup/CMakeLists.txt | 2 +-
drivers/filesystems/nfs/CMakeLists.txt | 2 +-
drivers/filesystems/npfs/CMakeLists.txt | 2 +-
drivers/filesystems/ntfs/CMakeLists.txt | 2 +-
drivers/filesystems/reiserfs/CMakeLists.txt | 2 +-
drivers/filesystems/udfs/CMakeLists.txt | 2 +-
drivers/filters/fltmgr/CMakeLists.txt | 2 +-
drivers/filters/mountmgr/CMakeLists.txt | 2 +-
drivers/hid/hidclass/CMakeLists.txt | 2 +-
drivers/hid/hidparse/CMakeLists.txt | 2 +-
drivers/hid/hidusb/CMakeLists.txt | 2 +-
drivers/hid/kbdhid/CMakeLists.txt | 2 +-
drivers/hid/mouhid/CMakeLists.txt | 2 +-
drivers/input/i8042prt/CMakeLists.txt | 2 +-
drivers/input/kbdclass/CMakeLists.txt | 2 +-
drivers/input/mouclass/CMakeLists.txt | 2 +-
drivers/input/sermouse/CMakeLists.txt | 2 +-
drivers/ksfilter/ks/CMakeLists.txt | 2 +-
drivers/ksfilter/swenum/CMakeLists.txt | 2 +-
drivers/multimedia/bdasup/CMakeLists.txt | 2 +-
drivers/network/afd/CMakeLists.txt | 2 +-
drivers/network/dd/e1000/CMakeLists.txt | 2 +-
drivers/network/dd/ne2000/CMakeLists.txt | 2 +-
drivers/network/dd/pcnet/CMakeLists.txt | 2 +-
drivers/network/dd/rtl8139/CMakeLists.txt | 2 +-
drivers/network/ndis/CMakeLists.txt | 2 +-
drivers/network/ndisuio/CMakeLists.txt | 2 +-
drivers/network/tcpip/CMakeLists.txt | 2 +-
drivers/network/tdi/CMakeLists.txt | 2 +-
drivers/parallel/parallel/CMakeLists.txt | 2 +-
drivers/parallel/parport/CMakeLists.txt | 2 +-
drivers/processor/processr/CMakeLists.txt | 2 +-
drivers/sac/driver/CMakeLists.txt | 2 +-
drivers/serial/serenum/CMakeLists.txt | 2 +-
drivers/serial/serial/CMakeLists.txt | 2 +-
drivers/setup/blue/CMakeLists.txt | 2 +-
drivers/storage/class/cdrom/CMakeLists.txt | 2 +-
drivers/storage/class/cdrom_new/CMakeLists.txt | 2 +-
drivers/storage/class/class2/CMakeLists.txt | 2 +-
drivers/storage/class/disk/CMakeLists.txt | 2 +-
drivers/storage/class/disk_new/CMakeLists.txt | 2 +-
drivers/storage/class/ramdisk/CMakeLists.txt | 2 +-
drivers/storage/classpnp/CMakeLists.txt | 2 +-
drivers/storage/fdc/fdc/CMakeLists.txt | 2 +-
drivers/storage/floppy/CMakeLists.txt | 2 +-
drivers/storage/floppy_new/CMakeLists.txt | 2 +-
drivers/storage/ide/atapi/CMakeLists.txt | 2 +-
drivers/storage/ide/pciide/CMakeLists.txt | 2 +-
drivers/storage/ide/pciidex/CMakeLists.txt | 2 +-
drivers/storage/ide/uniata/CMakeLists.txt | 2 +-
drivers/storage/port/buslogic/CMakeLists.txt | 2 +-
drivers/storage/port/storport/CMakeLists.txt | 2 +-
drivers/storage/scsiport/CMakeLists.txt | 2 +-
drivers/storage/storahci/CMakeLists.txt | 2 +-
drivers/usb/usbaudio/CMakeLists.txt | 2 +-
drivers/usb/usbccgp/CMakeLists.txt | 2 +-
drivers/usb/usbd/CMakeLists.txt | 2 +-
drivers/usb/usbehci/CMakeLists.txt | 2 +-
drivers/usb/usbehci_new/CMakeLists.txt | 2 +-
drivers/usb/usbhub/CMakeLists.txt | 2 +-
drivers/usb/usbhub_new/CMakeLists.txt | 2 +-
drivers/usb/usbohci/CMakeLists.txt | 2 +-
drivers/usb/usbohci_new/CMakeLists.txt | 2 +-
drivers/usb/usbport/CMakeLists.txt | 2 +-
drivers/usb/usbstor/CMakeLists.txt | 2 +-
drivers/usb/usbstor_new/CMakeLists.txt | 2 +-
drivers/usb/usbuhci/CMakeLists.txt | 2 +-
drivers/usb/usbuhci_new/CMakeLists.txt | 2 +-
drivers/wdm/audio/backpln/portcls/CMakeLists.txt | 2 +-
drivers/wdm/audio/drivers/CMIDriver/CMakeLists.txt | 2 +-
drivers/wdm/audio/drivers/CMIDriver/cpl/CMakeLists.txt | 2 +-
drivers/wdm/audio/drm/drmk/CMakeLists.txt | 2 +-
drivers/wdm/audio/filters/kmixer/CMakeLists.txt | 2 +-
drivers/wdm/audio/hdaudbus/CMakeLists.txt | 2 +-
drivers/wdm/audio/legacy/wdmaud/CMakeLists.txt | 2 +-
drivers/wdm/audio/sysaudio/CMakeLists.txt | 2 +-
drivers/wmi/CMakeLists.txt | 2 +-
hal/halarm/CMakeLists.txt | 2 +-
hal/halx86/CMakeLists.txt | 4 ++--
media/themes/blackshade.msstyles/CMakeLists.txt | 2 +-
media/themes/lautus.msstyles/CMakeLists.txt | 2 +-
media/themes/modern.msstyles/CMakeLists.txt | 2 +-
.../applications/explorer-old/notifyhook/CMakeLists.txt | 2 +-
modules/rosapps/drivers/green/CMakeLists.txt | 2 +-
modules/rosapps/drivers/vcdrom/CMakeLists.txt | 2 +-
modules/rosapps/drivers/vfd/CMakeLists.txt | 2 +-
modules/rosapps/lib/vfdlib/CMakeLists.txt | 2 +-
modules/rostests/apitests/crt/msvcrt_crt_apitest.cmake | 4 ++--
modules/rostests/apitests/kernel32/redirptest/CMakeLists.txt | 4 ++--
modules/rostests/apitests/localspl/dll/CMakeLists.txt | 2 +-
.../rostests/apitests/ntdll/load_notifications/CMakeLists.txt | 2 +-
modules/rostests/apitests/win32u/win32u_2k3sp2/CMakeLists.txt | 2 +-
modules/rostests/apitests/win32u/win32u_2ksp4/CMakeLists.txt | 2 +-
modules/rostests/apitests/win32u/win32u_ros/CMakeLists.txt | 2 +-
modules/rostests/apitests/win32u/win32u_vista/CMakeLists.txt | 2 +-
modules/rostests/apitests/win32u/win32u_xpsp2/CMakeLists.txt | 2 +-
modules/rostests/kmtests/CMakeLists.txt | 2 +-
modules/rostests/kmtests/example/CMakeLists.txt | 2 +-
modules/rostests/kmtests/fltmgr/fltmgr_create/CMakeLists.txt | 2 +-
modules/rostests/kmtests/fltmgr/fltmgr_load/CMakeLists.txt | 2 +-
modules/rostests/kmtests/fltmgr/fltmgr_register/CMakeLists.txt | 2 +-
modules/rostests/kmtests/hidparse/CMakeLists.txt | 2 +-
modules/rostests/kmtests/kernel32/CMakeLists.txt | 2 +-
modules/rostests/kmtests/ntos_cc/CMakeLists.txt | 10 +++++-----
modules/rostests/kmtests/ntos_io/CMakeLists.txt | 8 ++++----
modules/rostests/kmtests/ntos_mm/CMakeLists.txt | 4 ++--
modules/rostests/kmtests/ntos_po/CMakeLists.txt | 2 +-
modules/rostests/kmtests/tcpip/CMakeLists.txt | 2 +-
modules/rostests/tests/dllexport/CMakeLists.txt | 6 +++---
modules/rostests/win32/advapi32/eventlog/CMakeLists.txt | 2 +-
modules/rostests/winetests/msi/CMakeLists.txt | 2 +-
sdk/cmake/CMakeMacros.cmake | 4 ++--
sdk/cmake/gcc.cmake | 5 +++++
sdk/cmake/msvc.cmake | 5 +++++
sdk/include/asm/CMakeLists.txt | 2 +-
sdk/lib/3rdparty/bzip2/CMakeLists.txt | 2 +-
subsystems/mvdm/pifmgr/CMakeLists.txt | 2 +-
subsystems/mvdm/samples/testvdd/CMakeLists.txt | 2 +-
subsystems/mvdm/vdmdbg/CMakeLists.txt | 2 +-
subsystems/win/basesrv/CMakeLists.txt | 2 +-
subsystems/win32/csrsrv/CMakeLists.txt | 2 +-
toolchain-clang.cmake | 1 +
toolchain-gcc.cmake | 1 +
win32ss/CMakeLists.txt | 2 +-
win32ss/drivers/displays/framebuf/CMakeLists.txt | 2 +-
win32ss/drivers/displays/framebuf_new/CMakeLists.txt | 2 +-
win32ss/drivers/displays/vga/CMakeLists.txt | 2 +-
win32ss/drivers/displays/vga_new/CMakeLists.txt | 2 +-
win32ss/drivers/font/bmfd/CMakeLists.txt | 2 +-
win32ss/drivers/font/ftfd/CMakeLists.txt | 2 +-
win32ss/drivers/miniport/vbe/CMakeLists.txt | 2 +-
win32ss/drivers/miniport/vga/CMakeLists.txt | 2 +-
win32ss/drivers/miniport/vga_new/CMakeLists.txt | 2 +-
win32ss/drivers/miniport/vmx_svga/CMakeLists.txt | 2 +-
win32ss/drivers/miniport/xboxvmp/CMakeLists.txt | 2 +-
win32ss/drivers/videoprt/CMakeLists.txt | 2 +-
win32ss/drivers/watchdog/CMakeLists.txt | 2 +-
win32ss/gdi/gdi32/CMakeLists.txt | 2 +-
win32ss/printing/base/spoolss/CMakeLists.txt | 2 +-
win32ss/printing/base/winspool/CMakeLists.txt | 2 +-
win32ss/printing/monitors/localmon/CMakeLists.txt | 2 +-
win32ss/printing/monitors/localmon/ui/CMakeLists.txt | 2 +-
win32ss/printing/processors/winprint/CMakeLists.txt | 2 +-
win32ss/printing/providers/localspl/CMakeLists.txt | 2 +-
win32ss/reactx/dxapi/CMakeLists.txt | 2 +-
win32ss/reactx/dxg/CMakeLists.txt | 2 +-
win32ss/reactx/dxgthk/CMakeLists.txt | 2 +-
win32ss/user/user32/CMakeLists.txt | 2 +-
win32ss/user/winsrv/CMakeLists.txt | 2 +-
544 files changed, 566 insertions(+), 553 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 84b900c37e..3b66140da1 100644
--- 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)
diff --git a/base/applications/charmap_new/CMakeLists.txt
b/base/applications/charmap_new/CMakeLists.txt
index 005eff5596..657a5cb8fd 100644
--- 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)
diff --git a/base/applications/kbswitch/kbsdll/CMakeLists.txt
b/base/applications/kbswitch/kbsdll/CMakeLists.txt
index b192592cde..65766c8a04 100644
--- 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)
diff --git a/base/applications/regedit/clb/CMakeLists.txt
b/base/applications/regedit/clb/CMakeLists.txt
index e42653eb50..ae01afcf05 100644
--- 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)
diff --git a/base/services/dcomlaunch/CMakeLists.txt
b/base/services/dcomlaunch/CMakeLists.txt
index 6759d029aa..3a736d2b37 100644
--- 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
diff --git a/base/services/dhcpcsvc/CMakeLists.txt
b/base/services/dhcpcsvc/CMakeLists.txt
index 517582e558..e559f15524 100644
--- 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
diff --git a/base/services/schedsvc/CMakeLists.txt
b/base/services/schedsvc/CMakeLists.txt
index aef862da15..df44946efc 100644
--- 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
diff --git a/base/services/shsvcs/CMakeLists.txt b/base/services/shsvcs/CMakeLists.txt
index 1de1b2637e..2c754dbba5 100644
--- 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
diff --git a/base/services/srvsvc/CMakeLists.txt b/base/services/srvsvc/CMakeLists.txt
index b72e9f9e49..d66f7abbe6 100644
--- 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
diff --git a/base/services/umpnpmgr/CMakeLists.txt
b/base/services/umpnpmgr/CMakeLists.txt
index c361e5ef23..4248d0e9d8 100644
--- 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
diff --git a/base/services/wkssvc/CMakeLists.txt b/base/services/wkssvc/CMakeLists.txt
index 2d2edea85f..d7404cdcb5 100644
--- 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
diff --git a/base/services/wmisvc/CMakeLists.txt b/base/services/wmisvc/CMakeLists.txt
index 3c8b8f9f92..27bfeb0e0e 100644
--- 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)
diff --git a/base/services/wuauserv/CMakeLists.txt
b/base/services/wuauserv/CMakeLists.txt
index 841d836fa6..14ffee8419 100644
--- 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)
diff --git a/base/shell/rshell/CMakeLists.txt b/base/shell/rshell/CMakeLists.txt
index 39a2b19d23..4297edbb2e 100644
--- 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)
diff --git a/dll/3rdparty/dxtn/CMakeLists.txt b/dll/3rdparty/dxtn/CMakeLists.txt
index 6a9c643287..c615500586 100644
--- 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)
diff --git a/dll/3rdparty/libjpeg/CMakeLists.txt b/dll/3rdparty/libjpeg/CMakeLists.txt
index 41a142dba0..fefc3da850 100644
--- 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)
diff --git a/dll/3rdparty/libpng/CMakeLists.txt b/dll/3rdparty/libpng/CMakeLists.txt
index cf4b0b4ed4..2e293d369c 100644
--- 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)
diff --git a/dll/3rdparty/libtiff/CMakeLists.txt b/dll/3rdparty/libtiff/CMakeLists.txt
index 476e2b1f72..10fd5e33b0 100644
--- 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)
diff --git a/dll/3rdparty/libtirpc/CMakeLists.txt b/dll/3rdparty/libtirpc/CMakeLists.txt
index 46714d6d71..a48db75fdb 100644
--- 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
diff --git a/dll/3rdparty/libxslt/CMakeLists.txt b/dll/3rdparty/libxslt/CMakeLists.txt
index e7089136d6..336b1df899 100644
--- 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)
diff --git a/dll/3rdparty/mbedtls/CMakeLists.txt b/dll/3rdparty/mbedtls/CMakeLists.txt
index 7a5210bdef..dcc0a7c2b7 100644
--- 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)
diff --git a/dll/apisets/CMakeLists.txt b/dll/apisets/CMakeLists.txt
index 645a2fcdec..778af7f878 100644
--- 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)
diff --git a/dll/appcompat/apphelp/CMakeLists.txt b/dll/appcompat/apphelp/CMakeLists.txt
index 71cb783c74..20312169c7 100644
--- 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
diff --git a/dll/appcompat/shims/genral/CMakeLists.txt
b/dll/appcompat/shims/genral/CMakeLists.txt
index b0e98edcec..da6a55d998 100644
--- 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)
diff --git a/dll/appcompat/shims/layer/CMakeLists.txt
b/dll/appcompat/shims/layer/CMakeLists.txt
index d2b70b2b99..74c7fb0c7b 100644
--- 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)
diff --git a/dll/cpl/access/CMakeLists.txt b/dll/cpl/access/CMakeLists.txt
index 1e07328ba5..3e606afb0e 100644
--- 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)
diff --git a/dll/cpl/appwiz/CMakeLists.txt b/dll/cpl/appwiz/CMakeLists.txt
index 1a7e4a048c..5afee76d7d 100644
--- 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)
diff --git a/dll/cpl/console/CMakeLists.txt b/dll/cpl/console/CMakeLists.txt
index bbbb684638..c62ffcaa1c 100644
--- 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)
diff --git a/dll/cpl/desk/CMakeLists.txt b/dll/cpl/desk/CMakeLists.txt
index ae7fb83825..597679bbf3 100644
--- 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
diff --git a/dll/cpl/hdwwiz/CMakeLists.txt b/dll/cpl/hdwwiz/CMakeLists.txt
index 205e4622c0..2c6c949cdb 100644
--- 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)
diff --git a/dll/cpl/hotplug/CMakeLists.txt b/dll/cpl/hotplug/CMakeLists.txt
index 46c8d3de2d..65bd5237a2 100644
--- 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)
diff --git a/dll/cpl/inetcpl/CMakeLists.txt b/dll/cpl/inetcpl/CMakeLists.txt
index 28acde0a4f..09293f3393 100644
--- 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
diff --git a/dll/cpl/input/CMakeLists.txt b/dll/cpl/input/CMakeLists.txt
index b9cecb1c2f..77363d5e72 100644
--- 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)
diff --git a/dll/cpl/intl/CMakeLists.txt b/dll/cpl/intl/CMakeLists.txt
index d18db6f248..a2b6723e25 100644
--- 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)
diff --git a/dll/cpl/joy/CMakeLists.txt b/dll/cpl/joy/CMakeLists.txt
index 9e5bd9128b..70a345f6a2 100644
--- 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)
diff --git a/dll/cpl/liccpa/CMakeLists.txt b/dll/cpl/liccpa/CMakeLists.txt
index c5871dbef3..e4435d4a73 100644
--- 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)
diff --git a/dll/cpl/main/CMakeLists.txt b/dll/cpl/main/CMakeLists.txt
index 7597123561..9746795a7f 100644
--- 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)
diff --git a/dll/cpl/mmsys/CMakeLists.txt b/dll/cpl/mmsys/CMakeLists.txt
index 885b40621f..3b2abc51d6 100644
--- 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)
diff --git a/dll/cpl/ncpa/CMakeLists.txt b/dll/cpl/ncpa/CMakeLists.txt
index 2d92f48ba1..82a2b30fd3 100644
--- 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)
diff --git a/dll/cpl/odbccp32/CMakeLists.txt b/dll/cpl/odbccp32/CMakeLists.txt
index 950940e9c7..9337f1f790 100644
--- 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)
diff --git a/dll/cpl/openglcfg/CMakeLists.txt b/dll/cpl/openglcfg/CMakeLists.txt
index 2018e5b831..17998263b6 100644
--- 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)
diff --git a/dll/cpl/powercfg/CMakeLists.txt b/dll/cpl/powercfg/CMakeLists.txt
index fadd507c57..9de4c55873 100644
--- 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)
diff --git a/dll/cpl/sysdm/CMakeLists.txt b/dll/cpl/sysdm/CMakeLists.txt
index 865d5e7697..4643a4523b 100644
--- 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)
diff --git a/dll/cpl/telephon/CMakeLists.txt b/dll/cpl/telephon/CMakeLists.txt
index 222d5773c8..625872267e 100644
--- 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)
diff --git a/dll/cpl/timedate/CMakeLists.txt b/dll/cpl/timedate/CMakeLists.txt
index ce5907dec1..d1ad1db070 100644
--- 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)
diff --git a/dll/cpl/usrmgr/CMakeLists.txt b/dll/cpl/usrmgr/CMakeLists.txt
index ff4f9f7ea1..7d5ce65549 100644
--- 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)
diff --git a/dll/cpl/wined3dcfg/CMakeLists.txt b/dll/cpl/wined3dcfg/CMakeLists.txt
index f7e5b96113..9121b99469 100644
--- 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)
diff --git a/dll/directx/d3d8thk/CMakeLists.txt b/dll/directx/d3d8thk/CMakeLists.txt
index a17a11544f..a6fc668518 100644
--- 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)
diff --git a/dll/directx/ddraw/CMakeLists.txt b/dll/directx/ddraw/CMakeLists.txt
index 73518dfe7d..e86062f167 100644
--- 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)
diff --git a/dll/directx/ksproxy/CMakeLists.txt b/dll/directx/ksproxy/CMakeLists.txt
index 122623b770..15d7ebc0bf 100644
--- 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)
diff --git a/dll/directx/ksuser/CMakeLists.txt b/dll/directx/ksuser/CMakeLists.txt
index d113df9512..f6c0c75f51 100644
--- 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)
diff --git a/dll/directx/wine/amstream/CMakeLists.txt
b/dll/directx/wine/amstream/CMakeLists.txt
index 85ee1a45e3..45fd90c328 100644
--- 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)
diff --git a/dll/directx/wine/d3d8/CMakeLists.txt b/dll/directx/wine/d3d8/CMakeLists.txt
index 09d7a6c659..d3d49e2e76 100644
--- 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
diff --git a/dll/directx/wine/d3d9/CMakeLists.txt b/dll/directx/wine/d3d9/CMakeLists.txt
index 223606b87e..14dd3e6532 100644
--- 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
diff --git a/dll/directx/wine/d3dcompiler_43/CMakeLists.txt
b/dll/directx/wine/d3dcompiler_43/CMakeLists.txt
index d00c1b69ec..49d18b0b07 100644
--- 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)
diff --git a/dll/directx/wine/d3drm/CMakeLists.txt
b/dll/directx/wine/d3drm/CMakeLists.txt
index f2ff1f204e..cd1eaad883 100644
--- 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
diff --git a/dll/directx/wine/d3dx9_24/CMakeLists.txt
b/dll/directx/wine/d3dx9_24/CMakeLists.txt
index 9381b3842a..44e22294ec 100644
--- 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)
diff --git a/dll/directx/wine/d3dx9_25/CMakeLists.txt
b/dll/directx/wine/d3dx9_25/CMakeLists.txt
index 24d296d9b2..bc71d7d915 100644
--- 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)
diff --git a/dll/directx/wine/d3dx9_26/CMakeLists.txt
b/dll/directx/wine/d3dx9_26/CMakeLists.txt
index f9264fff34..3a95d89ae9 100644
--- 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)
diff --git a/dll/directx/wine/d3dx9_27/CMakeLists.txt
b/dll/directx/wine/d3dx9_27/CMakeLists.txt
index a75b0088f3..35f95fb632 100644
--- 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)
diff --git a/dll/directx/wine/d3dx9_28/CMakeLists.txt
b/dll/directx/wine/d3dx9_28/CMakeLists.txt
index 9bd5e8e6bd..2573902b03 100644
--- 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)
diff --git a/dll/directx/wine/d3dx9_29/CMakeLists.txt
b/dll/directx/wine/d3dx9_29/CMakeLists.txt
index 83d408ff0a..07f454a2ab 100644
--- 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)
diff --git a/dll/directx/wine/d3dx9_30/CMakeLists.txt
b/dll/directx/wine/d3dx9_30/CMakeLists.txt
index 696605f867..f6613cf92e 100644
--- 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)
diff --git a/dll/directx/wine/d3dx9_31/CMakeLists.txt
b/dll/directx/wine/d3dx9_31/CMakeLists.txt
index be20ad24bb..d6f23b999c 100644
--- 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)
diff --git a/dll/directx/wine/d3dx9_32/CMakeLists.txt
b/dll/directx/wine/d3dx9_32/CMakeLists.txt
index 28d140227d..fae73ec241 100644
--- 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)
diff --git a/dll/directx/wine/d3dx9_33/CMakeLists.txt
b/dll/directx/wine/d3dx9_33/CMakeLists.txt
index 99407695d1..c17d9a8eeb 100644
--- 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)
diff --git a/dll/directx/wine/d3dx9_34/CMakeLists.txt
b/dll/directx/wine/d3dx9_34/CMakeLists.txt
index 4902df6fd8..fbc11f55e0 100644
--- 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)
diff --git a/dll/directx/wine/d3dx9_35/CMakeLists.txt
b/dll/directx/wine/d3dx9_35/CMakeLists.txt
index 50884be4ec..93e0ff5191 100644
--- 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)
diff --git a/dll/directx/wine/d3dx9_36/CMakeLists.txt
b/dll/directx/wine/d3dx9_36/CMakeLists.txt
index 836ee9c743..0740c46f98 100644
--- 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
diff --git a/dll/directx/wine/d3dx9_37/CMakeLists.txt
b/dll/directx/wine/d3dx9_37/CMakeLists.txt
index f248a5ca0e..798c304434 100644
--- 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)
diff --git a/dll/directx/wine/d3dx9_38/CMakeLists.txt
b/dll/directx/wine/d3dx9_38/CMakeLists.txt
index 2397cc5380..556b43ed3b 100644
--- 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)
diff --git a/dll/directx/wine/d3dx9_39/CMakeLists.txt
b/dll/directx/wine/d3dx9_39/CMakeLists.txt
index 58ed406b9e..9a4e1fc7eb 100644
--- 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)
diff --git a/dll/directx/wine/d3dx9_40/CMakeLists.txt
b/dll/directx/wine/d3dx9_40/CMakeLists.txt
index 97373a52b5..2037e9c831 100644
--- 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)
diff --git a/dll/directx/wine/d3dx9_41/CMakeLists.txt
b/dll/directx/wine/d3dx9_41/CMakeLists.txt
index 3476a43208..fdbe0821e0 100644
--- 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)
diff --git a/dll/directx/wine/d3dx9_42/CMakeLists.txt
b/dll/directx/wine/d3dx9_42/CMakeLists.txt
index 436b6954f8..d6b6dfb84b 100644
--- 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)
diff --git a/dll/directx/wine/d3dx9_43/CMakeLists.txt
b/dll/directx/wine/d3dx9_43/CMakeLists.txt
index 547285be2d..2361819fce 100644
--- 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)
diff --git a/dll/directx/wine/d3dxof/CMakeLists.txt
b/dll/directx/wine/d3dxof/CMakeLists.txt
index a4fff47f23..21b97cd652 100644
--- 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
diff --git a/dll/directx/wine/ddraw/CMakeLists.txt
b/dll/directx/wine/ddraw/CMakeLists.txt
index 6141d630f3..03029bdc8f 100644
--- 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)
diff --git a/dll/directx/wine/devenum/CMakeLists.txt
b/dll/directx/wine/devenum/CMakeLists.txt
index 1f5e7eb321..671921748a 100644
--- 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)
diff --git a/dll/directx/wine/dinput/CMakeLists.txt
b/dll/directx/wine/dinput/CMakeLists.txt
index d964e748e9..7244903e99 100644
--- 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
diff --git a/dll/directx/wine/dinput8/CMakeLists.txt
b/dll/directx/wine/dinput8/CMakeLists.txt
index 28d1142f0d..fb114aa2a2 100644
--- 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)
diff --git a/dll/directx/wine/dmusic/CMakeLists.txt
b/dll/directx/wine/dmusic/CMakeLists.txt
index fe4c270680..88abed338b 100644
--- 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)
diff --git a/dll/directx/wine/dplay/CMakeLists.txt
b/dll/directx/wine/dplay/CMakeLists.txt
index 2c3f394fe5..fe71c25dd8 100644
--- 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)
diff --git a/dll/directx/wine/dplayx/CMakeLists.txt
b/dll/directx/wine/dplayx/CMakeLists.txt
index 867ba69001..61049520d4 100644
--- 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)
diff --git a/dll/directx/wine/dsound/CMakeLists.txt
b/dll/directx/wine/dsound/CMakeLists.txt
index 82ef4652d1..145453b6cd 100644
--- 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
diff --git a/dll/directx/wine/dxdiagn/CMakeLists.txt
b/dll/directx/wine/dxdiagn/CMakeLists.txt
index 7e16a5a07a..34c3b63737 100644
--- 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
diff --git a/dll/directx/wine/msdmo/CMakeLists.txt
b/dll/directx/wine/msdmo/CMakeLists.txt
index 43b7a8074a..d8d1d34bea 100644
--- 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
diff --git a/dll/directx/wine/qedit/CMakeLists.txt
b/dll/directx/wine/qedit/CMakeLists.txt
index 7ee22ff31b..50cca289d7 100644
--- 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)
diff --git a/dll/directx/wine/quartz/CMakeLists.txt
b/dll/directx/wine/quartz/CMakeLists.txt
index 8c12e38b85..e0996b88a0 100644
--- 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
diff --git a/dll/directx/wine/wined3d/CMakeLists.txt
b/dll/directx/wine/wined3d/CMakeLists.txt
index 235adab902..29b337e3bd 100644
--- 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)
diff --git a/dll/keyboard/CMakeLists.txt b/dll/keyboard/CMakeLists.txt
index 76edef5b79..406e314b78 100644
--- 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)
diff --git a/dll/nls/idndl/CMakeLists.txt b/dll/nls/idndl/CMakeLists.txt
index 590ceec807..efbd71ed0f 100644
--- 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)
diff --git a/dll/nls/normaliz/CMakeLists.txt b/dll/nls/normaliz/CMakeLists.txt
index 95a41e5d88..ee51a44aca 100644
--- 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)
diff --git a/dll/np/nfs/CMakeLists.txt b/dll/np/nfs/CMakeLists.txt
index b3d32f3db2..acb8c29567 100644
--- 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)
diff --git a/dll/ntdll/CMakeLists.txt b/dll/ntdll/CMakeLists.txt
index e94db5c77a..5ea6ca5d3d 100644
--- 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
diff --git a/dll/opengl/glu32/CMakeLists.txt b/dll/opengl/glu32/CMakeLists.txt
index df3a5bb5af..791cf2df1e 100644
--- 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}
diff --git a/dll/opengl/opengl32/CMakeLists.txt b/dll/opengl/opengl32/CMakeLists.txt
index 9e3b054e53..86e7800d77 100644
--- 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)
diff --git a/dll/shellext/acppage/CMakeLists.txt b/dll/shellext/acppage/CMakeLists.txt
index 0f16701e3c..9303c23110 100644
--- 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
diff --git a/dll/shellext/cryptext/CMakeLists.txt b/dll/shellext/cryptext/CMakeLists.txt
index 8cd10f4a43..3aca7374b1 100644
--- 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
diff --git a/dll/shellext/deskadp/CMakeLists.txt b/dll/shellext/deskadp/CMakeLists.txt
index 8333fa03d7..e0e0181267 100644
--- 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)
diff --git a/dll/shellext/deskmon/CMakeLists.txt b/dll/shellext/deskmon/CMakeLists.txt
index 93264f1e6a..d01e2e0987 100644
--- a/dll/shellext/deskmon/CMakeLists.txt
+++ b/dll/shellext/deskmon/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
add_rc_deps(deskmon.rc ${CMAKE_CURRENT_SOURCE_DIR}/resources/monitor.ico)
-add_library(deskmon SHARED
+add_library(deskmon MODULE
${SOURCE}
deskmon.rc
${CMAKE_CURRENT_BINARY_DIR}/deskmon.def)
diff --git a/dll/shellext/devcpux/CMakeLists.txt b/dll/shellext/devcpux/CMakeLists.txt
index 08624da93d..149d9c5c34 100644
--- a/dll/shellext/devcpux/CMakeLists.txt
+++ b/dll/shellext/devcpux/CMakeLists.txt
@@ -1,6 +1,6 @@
spec2def(devcpux.dll devcpux.spec)
-add_library(devcpux SHARED processor.c processor.rc
${CMAKE_CURRENT_BINARY_DIR}/devcpux.def)
+add_library(devcpux MODULE processor.c processor.rc
${CMAKE_CURRENT_BINARY_DIR}/devcpux.def)
set_module_type(devcpux win32dll UNICODE)
add_importlibs(devcpux user32 powrprof comctl32 msvcrt kernel32 ntdll)
add_cd_file(TARGET devcpux DESTINATION reactos/system32 FOR all)
diff --git a/dll/shellext/fontext/CMakeLists.txt b/dll/shellext/fontext/CMakeLists.txt
index a31e78d3e3..b50844ee7e 100644
--- a/dll/shellext/fontext/CMakeLists.txt
+++ b/dll/shellext/fontext/CMakeLists.txt
@@ -6,7 +6,7 @@ list(APPEND SOURCE
regsvr.c
fontext.h)
-add_library(fontext SHARED
+add_library(fontext MODULE
${SOURCE}
fontext.rc
${CMAKE_CURRENT_BINARY_DIR}/fontext.def)
diff --git a/dll/shellext/netshell/CMakeLists.txt b/dll/shellext/netshell/CMakeLists.txt
index cff3ce29e4..0a2c0fad15 100644
--- a/dll/shellext/netshell/CMakeLists.txt
+++ b/dll/shellext/netshell/CMakeLists.txt
@@ -32,7 +32,7 @@ list(APPEND SOURCE
file(GLOB netshell_rc_deps res/*.*)
add_rc_deps(netshell.rc ${netshell_rc_deps})
-add_library(netshell SHARED
+add_library(netshell MODULE
${SOURCE}
netshell.rc
${CMAKE_CURRENT_BINARY_DIR}/netshell_stubs.c
diff --git a/dll/shellext/ntobjshex/CMakeLists.txt
b/dll/shellext/ntobjshex/CMakeLists.txt
index 9d2c76e217..f8a6e7347b 100644
--- a/dll/shellext/ntobjshex/CMakeLists.txt
+++ b/dll/shellext/ntobjshex/CMakeLists.txt
@@ -24,7 +24,7 @@ list(APPEND SOURCE
regfolder.cpp
precomp.h)
-add_library(ntobjshex SHARED
+add_library(ntobjshex MODULE
${SOURCE}
ntobjshex.rc
${CMAKE_CURRENT_BINARY_DIR}/ntobjshex.def)
diff --git a/dll/shellext/shellbtrfs/CMakeLists.txt
b/dll/shellext/shellbtrfs/CMakeLists.txt
index 5b239ca2e1..660699cd43 100644
--- a/dll/shellext/shellbtrfs/CMakeLists.txt
+++ b/dll/shellext/shellbtrfs/CMakeLists.txt
@@ -26,7 +26,7 @@ list(APPEND SOURCE
volpropsheet.cpp
precomp.h)
-add_library(shellbtrfs SHARED
+add_library(shellbtrfs MODULE
${SOURCE}
guid.c
shellbtrfs.rc
diff --git a/dll/shellext/stobject/CMakeLists.txt b/dll/shellext/stobject/CMakeLists.txt
index e25e433f6f..093303f728 100644
--- a/dll/shellext/stobject/CMakeLists.txt
+++ b/dll/shellext/stobject/CMakeLists.txt
@@ -28,7 +28,7 @@ list(APPEND SOURCE
volume.cpp
precomp.h)
-add_library(stobject SHARED
+add_library(stobject MODULE
${SOURCE}
stobject.rc
${CMAKE_CURRENT_BINARY_DIR}/stobject.def)
diff --git a/dll/shellext/zipfldr/CMakeLists.txt b/dll/shellext/zipfldr/CMakeLists.txt
index f527665805..9ad72cb173 100644
--- a/dll/shellext/zipfldr/CMakeLists.txt
+++ b/dll/shellext/zipfldr/CMakeLists.txt
@@ -37,7 +37,7 @@ list(APPEND SOURCE
precomp.h
resource.h)
-add_library(zipfldr SHARED
+add_library(zipfldr MODULE
${SOURCE}
${ZLIB_SOURCE}
zipfldr.rc
diff --git a/dll/win32/acledit/CMakeLists.txt b/dll/win32/acledit/CMakeLists.txt
index fb2222b02f..db13727cc1 100644
--- a/dll/win32/acledit/CMakeLists.txt
+++ b/dll/win32/acledit/CMakeLists.txt
@@ -6,7 +6,7 @@ list(APPEND SOURCE
stubs.c
acleditint.h)
-add_library(acledit SHARED
+add_library(acledit MODULE
${SOURCE}
acledit.rc
${CMAKE_CURRENT_BINARY_DIR}/acledit.def)
diff --git a/dll/win32/aclui/CMakeLists.txt b/dll/win32/aclui/CMakeLists.txt
index de7a6b1c7b..24d43d5ad2 100644
--- a/dll/win32/aclui/CMakeLists.txt
+++ b/dll/win32/aclui/CMakeLists.txt
@@ -9,7 +9,7 @@ list(APPEND SOURCE
sidcache.c
precomp.h)
-add_library(aclui SHARED
+add_library(aclui MODULE
${SOURCE}
guid.c
aclui.rc
diff --git a/dll/win32/activeds/CMakeLists.txt b/dll/win32/activeds/CMakeLists.txt
index 19ddb86ba6..58225f1b3c 100644
--- a/dll/win32/activeds/CMakeLists.txt
+++ b/dll/win32/activeds/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
stubs.c
precomp.h)
-add_library(activeds SHARED
+add_library(activeds MODULE
${SOURCE}
${CMAKE_CURRENT_BINARY_DIR}/activeds.def)
diff --git a/dll/win32/actxprxy/CMakeLists.txt b/dll/win32/actxprxy/CMakeLists.txt
index 44672c94bb..22442e70e0 100644
--- a/dll/win32/actxprxy/CMakeLists.txt
+++ b/dll/win32/actxprxy/CMakeLists.txt
@@ -35,7 +35,7 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c
precomp.h)
-add_library(actxprxy SHARED
+add_library(actxprxy MODULE
${SOURCE}
actxprxy.rc
${CMAKE_CURRENT_BINARY_DIR}/actxprxy.def)
diff --git a/dll/win32/advapi32/CMakeLists.txt b/dll/win32/advapi32/CMakeLists.txt
index 744dc098a1..4a366badec 100644
--- a/dll/win32/advapi32/CMakeLists.txt
+++ b/dll/win32/advapi32/CMakeLists.txt
@@ -46,7 +46,7 @@ list(APPEND SOURCE
wine/security.c
advapi32.h)
-add_library(advapi32 SHARED
+add_library(advapi32 MODULE
${SOURCE}
advapi32.rc
${CMAKE_CURRENT_BINARY_DIR}/advapi32_stubs.c
diff --git a/dll/win32/advapi32_vista/CMakeLists.txt
b/dll/win32/advapi32_vista/CMakeLists.txt
index 34fc459a13..ab6e406876 100644
--- a/dll/win32/advapi32_vista/CMakeLists.txt
+++ b/dll/win32/advapi32_vista/CMakeLists.txt
@@ -12,7 +12,7 @@ list(APPEND SOURCE
RegLoadMUIString.c
${CMAKE_CURRENT_BINARY_DIR}/advapi32_vista.def)
-add_library(advapi32_vista SHARED ${SOURCE})
+add_library(advapi32_vista MODULE ${SOURCE})
set_module_type(advapi32_vista win32dll ENTRYPOINT DllMain 12)
target_link_libraries(advapi32_vista wine)
add_importlibs(advapi32_vista advapi32 kernel32 ntdll)
diff --git a/dll/win32/advpack/CMakeLists.txt b/dll/win32/advpack/CMakeLists.txt
index 585927435c..5df9b29d62 100644
--- a/dll/win32/advpack/CMakeLists.txt
+++ b/dll/win32/advpack/CMakeLists.txt
@@ -10,7 +10,7 @@ list(APPEND SOURCE
reg.c
precomp.h)
-add_library(advpack SHARED
+add_library(advpack MODULE
${SOURCE}
advpack.rc
${CMAKE_CURRENT_BINARY_DIR}/advpack.def)
diff --git a/dll/win32/atl/CMakeLists.txt b/dll/win32/atl/CMakeLists.txt
index 9697e5c0a5..475ebab24f 100644
--- a/dll/win32/atl/CMakeLists.txt
+++ b/dll/win32/atl/CMakeLists.txt
@@ -25,7 +25,7 @@ list(APPEND atl_rc_deps
set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS
"${atl_rc_deps}")
-add_library(atl SHARED
+add_library(atl MODULE
${SOURCE}
rsrc.rc
${CMAKE_CURRENT_BINARY_DIR}/atl.def)
diff --git a/dll/win32/atl100/CMakeLists.txt b/dll/win32/atl100/CMakeLists.txt
index 85fb948aa6..73c7843bbe 100644
--- a/dll/win32/atl100/CMakeLists.txt
+++ b/dll/win32/atl100/CMakeLists.txt
@@ -16,7 +16,7 @@ list(APPEND SOURCE
precomp.h
${CMAKE_CURRENT_BINARY_DIR}/atl100_stubs.c)
-add_library(atl100 SHARED
+add_library(atl100 MODULE
${SOURCE}
${CMAKE_CURRENT_BINARY_DIR}/atl100.def)
diff --git a/dll/win32/atl80/CMakeLists.txt b/dll/win32/atl80/CMakeLists.txt
index 6283b496ae..50bb95445f 100644
--- a/dll/win32/atl80/CMakeLists.txt
+++ b/dll/win32/atl80/CMakeLists.txt
@@ -16,7 +16,7 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/atl80_stubs.c
precomp.h)
-add_library(atl80 SHARED
+add_library(atl80 MODULE
${SOURCE}
${CMAKE_CURRENT_BINARY_DIR}/atl80.def)
diff --git a/dll/win32/authz/CMakeLists.txt b/dll/win32/authz/CMakeLists.txt
index 5d57622d9d..88174a48d5 100644
--- a/dll/win32/authz/CMakeLists.txt
+++ b/dll/win32/authz/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
precomp.h
${CMAKE_CURRENT_BINARY_DIR}/authz_stubs.c)
-add_library(authz SHARED
+add_library(authz MODULE
${SOURCE}
authz.rc
${CMAKE_CURRENT_BINARY_DIR}/authz.def)
diff --git a/dll/win32/avicap32/CMakeLists.txt b/dll/win32/avicap32/CMakeLists.txt
index 6972b43dd9..75720e4e95 100644
--- a/dll/win32/avicap32/CMakeLists.txt
+++ b/dll/win32/avicap32/CMakeLists.txt
@@ -3,7 +3,7 @@ spec2def(avicap32.dll avicap32.spec ADD_IMPORTLIB)
include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
-add_library(avicap32 SHARED
+add_library(avicap32 MODULE
avicap32.c
avicap32.rc
${CMAKE_CURRENT_BINARY_DIR}/avicap32.def)
diff --git a/dll/win32/avifil32/CMakeLists.txt b/dll/win32/avifil32/CMakeLists.txt
index c686301172..62daabfaea 100644
--- a/dll/win32/avifil32/CMakeLists.txt
+++ b/dll/win32/avifil32/CMakeLists.txt
@@ -21,7 +21,7 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c
precomp.h)
-add_library(avifil32 SHARED
+add_library(avifil32 MODULE
${SOURCE}
guid.c
rsrc.rc
diff --git a/dll/win32/batt/CMakeLists.txt b/dll/win32/batt/CMakeLists.txt
index cfd7f25fc1..cf775185b3 100644
--- a/dll/win32/batt/CMakeLists.txt
+++ b/dll/win32/batt/CMakeLists.txt
@@ -1,7 +1,7 @@
spec2def(batt.dll batt.spec)
-add_library(batt SHARED
+add_library(batt MODULE
batt.c
batt.rc
${CMAKE_CURRENT_BINARY_DIR}/batt.def)
diff --git a/dll/win32/bcrypt/CMakeLists.txt b/dll/win32/bcrypt/CMakeLists.txt
index bcac2afc12..eee62d3a6a 100644
--- a/dll/win32/bcrypt/CMakeLists.txt
+++ b/dll/win32/bcrypt/CMakeLists.txt
@@ -11,7 +11,7 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/bcrypt_stubs.c
${CMAKE_CURRENT_BINARY_DIR}/bcrypt.def)
-add_library(bcrypt SHARED ${SOURCE})
+add_library(bcrypt MODULE ${SOURCE})
set_module_type(bcrypt win32dll)
target_link_libraries(bcrypt wine)
add_importlibs(bcrypt mbedtls advapi32 msvcrt kernel32 ntdll)
diff --git a/dll/win32/beepmidi/CMakeLists.txt b/dll/win32/beepmidi/CMakeLists.txt
index d760fecbd1..d19032b01c 100644
--- a/dll/win32/beepmidi/CMakeLists.txt
+++ b/dll/win32/beepmidi/CMakeLists.txt
@@ -5,7 +5,7 @@ list(APPEND SOURCE
beepmidi.c
${CMAKE_CURRENT_BINARY_DIR}/beepmidi.def)
-add_library(beepmidi SHARED ${SOURCE})
+add_library(beepmidi MODULE ${SOURCE})
set_module_type(beepmidi win32dll UNICODE)
add_importlibs(beepmidi winmm msvcrt kernel32 ntdll)
add_cd_file(TARGET beepmidi DESTINATION reactos/system32 FOR all)
diff --git a/dll/win32/browseui/CMakeLists.txt b/dll/win32/browseui/CMakeLists.txt
index 8c0de76cf7..0c68a37df0 100644
--- a/dll/win32/browseui/CMakeLists.txt
+++ b/dll/win32/browseui/CMakeLists.txt
@@ -39,7 +39,7 @@ list(APPEND SOURCE
CProgressDialog.cpp
precomp.h)
-add_library(browseui SHARED
+add_library(browseui MODULE
${SOURCE}
dllinstall.c
browseui.rc
diff --git a/dll/win32/bthci/CMakeLists.txt b/dll/win32/bthci/CMakeLists.txt
index f8de46d10e..3e96448c2f 100644
--- a/dll/win32/bthci/CMakeLists.txt
+++ b/dll/win32/bthci/CMakeLists.txt
@@ -1,7 +1,7 @@
spec2def(bthci.dll bthci.spec)
-add_library(bthci SHARED
+add_library(bthci MODULE
bthci.c
bthci.rc
${CMAKE_CURRENT_BINARY_DIR}/bthci.def)
diff --git a/dll/win32/cabinet/CMakeLists.txt b/dll/win32/cabinet/CMakeLists.txt
index 20eb368d00..f770a5052f 100644
--- a/dll/win32/cabinet/CMakeLists.txt
+++ b/dll/win32/cabinet/CMakeLists.txt
@@ -15,7 +15,7 @@ list(APPEND SOURCE
fdi.c
precomp.h)
-add_library(cabinet SHARED
+add_library(cabinet MODULE
${SOURCE}
stubs.c
cabinet.rc
diff --git a/dll/win32/cards/CMakeLists.txt b/dll/win32/cards/CMakeLists.txt
index b2548675a8..822ea96318 100644
--- a/dll/win32/cards/CMakeLists.txt
+++ b/dll/win32/cards/CMakeLists.txt
@@ -9,7 +9,7 @@ list(APPEND SOURCE
cards.rc
${CMAKE_CURRENT_BINARY_DIR}/cards.def)
-add_library(cards SHARED ${SOURCE})
+add_library(cards MODULE ${SOURCE})
set_module_type(cards win32dll UNICODE)
add_importlibs(cards user32 gdi32 msvcrt kernel32)
add_cd_file(TARGET cards DESTINATION reactos/system32 FOR all)
diff --git a/dll/win32/cfgmgr32/CMakeLists.txt b/dll/win32/cfgmgr32/CMakeLists.txt
index 2e630932e6..5a40af5897 100644
--- a/dll/win32/cfgmgr32/CMakeLists.txt
+++ b/dll/win32/cfgmgr32/CMakeLists.txt
@@ -6,7 +6,7 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/cfgmgr32_stubs.c
${CMAKE_CURRENT_BINARY_DIR}/cfgmgr32.def)
-add_library(cfgmgr32 SHARED ${SOURCE})
+add_library(cfgmgr32 MODULE ${SOURCE})
set_module_type(cfgmgr32 win32dll)
add_importlibs(cfgmgr32 setupapi msvcrt kernel32 ntdll)
diff --git a/dll/win32/clusapi/CMakeLists.txt b/dll/win32/clusapi/CMakeLists.txt
index cb86fe4f9f..6d474658c5 100644
--- a/dll/win32/clusapi/CMakeLists.txt
+++ b/dll/win32/clusapi/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/clusapi_stubs.c
${CMAKE_CURRENT_BINARY_DIR}/clusapi.def)
-add_library(clusapi SHARED ${SOURCE})
+add_library(clusapi MODULE ${SOURCE})
set_module_type(clusapi win32dll)
target_link_libraries(clusapi wine)
add_importlibs(clusapi msvcrt kernel32 ntdll)
diff --git a/dll/win32/comcat/CMakeLists.txt b/dll/win32/comcat/CMakeLists.txt
index bff7fabe73..0e5d681010 100644
--- a/dll/win32/comcat/CMakeLists.txt
+++ b/dll/win32/comcat/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
comcat_main.c
${CMAKE_CURRENT_BINARY_DIR}/comcat.def)
-add_library(comcat SHARED ${SOURCE} version.rc)
+add_library(comcat MODULE ${SOURCE} version.rc)
set_module_type(comcat win32dll)
add_importlibs(comcat ole32 msvcrt kernel32)
add_cd_file(TARGET comcat DESTINATION reactos/system32 FOR all)
diff --git a/dll/win32/comctl32/CMakeLists.txt b/dll/win32/comctl32/CMakeLists.txt
index 4a1151bd98..8c05f33e6e 100644
--- a/dll/win32/comctl32/CMakeLists.txt
+++ b/dll/win32/comctl32/CMakeLists.txt
@@ -51,7 +51,7 @@ list(APPEND SOURCE
updown.c
precomp.h)
-add_library(comctl32 SHARED
+add_library(comctl32 MODULE
${SOURCE}
stubs.c
rsrc.rc
diff --git a/dll/win32/comdlg32/CMakeLists.txt b/dll/win32/comdlg32/CMakeLists.txt
index 37e1d7c102..bb87894e2c 100644
--- a/dll/win32/comdlg32/CMakeLists.txt
+++ b/dll/win32/comdlg32/CMakeLists.txt
@@ -19,7 +19,7 @@ list(APPEND SOURCE
precomp.h
${CMAKE_CURRENT_BINARY_DIR}/comdlg32_stubs.c)
-add_library(comdlg32 SHARED
+add_library(comdlg32 MODULE
${SOURCE}
rsrc.rc
${CMAKE_CURRENT_BINARY_DIR}/comdlg32.def)
diff --git a/dll/win32/compstui/CMakeLists.txt b/dll/win32/compstui/CMakeLists.txt
index 58d4f31301..bb561428ef 100644
--- a/dll/win32/compstui/CMakeLists.txt
+++ b/dll/win32/compstui/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
compstui_main.c
${CMAKE_CURRENT_BINARY_DIR}/compstui.def)
-add_library(compstui SHARED ${SOURCE})
+add_library(compstui MODULE ${SOURCE})
set_module_type(compstui win32dll)
target_link_libraries(compstui wine)
add_importlibs(compstui msvcrt kernel32 ntdll)
diff --git a/dll/win32/credui/CMakeLists.txt b/dll/win32/credui/CMakeLists.txt
index e6a9d1bf49..ab1fa0c3f3 100644
--- a/dll/win32/credui/CMakeLists.txt
+++ b/dll/win32/credui/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/credui_stubs.c
${CMAKE_CURRENT_BINARY_DIR}/credui.def)
-add_library(credui SHARED ${SOURCE} credui.rc)
+add_library(credui MODULE ${SOURCE} credui.rc)
set_module_type(credui win32dll)
target_link_libraries(credui wine)
add_importlibs(credui advapi32 user32 comctl32 msvcrt kernel32 ntdll)
diff --git a/dll/win32/crtdll/CMakeLists.txt b/dll/win32/crtdll/CMakeLists.txt
index 7562398be0..c40dda200e 100644
--- a/dll/win32/crtdll/CMakeLists.txt
+++ b/dll/win32/crtdll/CMakeLists.txt
@@ -17,7 +17,7 @@ list(APPEND SOURCE
crtdll.rc
${CMAKE_CURRENT_BINARY_DIR}/crtdll.def)
-add_library(crtdll SHARED ${SOURCE})
+add_library(crtdll MODULE ${SOURCE})
set_module_type(crtdll win32dll ENTRYPOINT DllMain 12)
target_link_libraries(crtdll crt wine)
diff --git a/dll/win32/crypt32/CMakeLists.txt b/dll/win32/crypt32/CMakeLists.txt
index 6bef4c7af9..e53c2f9e3b 100644
--- a/dll/win32/crypt32/CMakeLists.txt
+++ b/dll/win32/crypt32/CMakeLists.txt
@@ -37,7 +37,7 @@ list(APPEND SOURCE
str.c
precomp.h)
-add_library(crypt32 SHARED
+add_library(crypt32 MODULE
${SOURCE}
crypt32.rc
${CMAKE_CURRENT_BINARY_DIR}/crypt32_stubs.c
diff --git a/dll/win32/cryptdlg/CMakeLists.txt b/dll/win32/cryptdlg/CMakeLists.txt
index a7de252a2d..0ce5533907 100644
--- a/dll/win32/cryptdlg/CMakeLists.txt
+++ b/dll/win32/cryptdlg/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/cryptdlg_stubs.c
${CMAKE_CURRENT_BINARY_DIR}/cryptdlg.def)
-add_library(cryptdlg SHARED ${SOURCE} cryptdlg.rc)
+add_library(cryptdlg MODULE ${SOURCE} cryptdlg.rc)
set_module_type(cryptdlg win32dll)
target_link_libraries(cryptdlg wine)
add_importlibs(cryptdlg advapi32 user32 crypt32 cryptui wintrust msvcrt kernel32 ntdll)
diff --git a/dll/win32/cryptdll/CMakeLists.txt b/dll/win32/cryptdll/CMakeLists.txt
index ce14114231..8d64df81d0 100644
--- a/dll/win32/cryptdll/CMakeLists.txt
+++ b/dll/win32/cryptdll/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
stubs.c
${CMAKE_CURRENT_BINARY_DIR}/cryptdll.def)
-add_library(cryptdll SHARED ${SOURCE})
+add_library(cryptdll MODULE ${SOURCE})
set_module_type(cryptdll win32dll)
target_link_libraries(cryptdll wine)
add_importlibs(cryptdll advapi32 msvcrt kernel32 ntdll)
diff --git a/dll/win32/cryptnet/CMakeLists.txt b/dll/win32/cryptnet/CMakeLists.txt
index 52695eb765..9bbb47e694 100644
--- a/dll/win32/cryptnet/CMakeLists.txt
+++ b/dll/win32/cryptnet/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/cryptnet_stubs.c
${CMAKE_CURRENT_BINARY_DIR}/cryptnet.def)
-add_library(cryptnet SHARED ${SOURCE})
+add_library(cryptnet MODULE ${SOURCE})
set_module_type(cryptnet win32dll)
target_link_libraries(cryptnet wine)
add_delay_importlibs(cryptnet wininet)
diff --git a/dll/win32/cryptui/CMakeLists.txt b/dll/win32/cryptui/CMakeLists.txt
index f271151776..d6398711d4 100644
--- a/dll/win32/cryptui/CMakeLists.txt
+++ b/dll/win32/cryptui/CMakeLists.txt
@@ -11,7 +11,7 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/cryptui_stubs.c
${CMAKE_CURRENT_BINARY_DIR}/cryptui.def)
-add_library(cryptui SHARED ${SOURCE} cryptui.rc)
+add_library(cryptui MODULE ${SOURCE} cryptui.rc)
set_module_type(cryptui win32dll)
target_link_libraries(cryptui uuid wine)
add_delay_importlibs(cryptui urlmon wintrust)
diff --git a/dll/win32/dbghelp/CMakeLists.txt b/dll/win32/dbghelp/CMakeLists.txt
index ed64611e40..27b44e32ca 100644
--- a/dll/win32/dbghelp/CMakeLists.txt
+++ b/dll/win32/dbghelp/CMakeLists.txt
@@ -72,7 +72,7 @@ else()
type.c
precomp.h)
- add_library(dbghelp SHARED
+ add_library(dbghelp MODULE
${SOURCE}
version.rc
${CMAKE_CURRENT_BINARY_DIR}/dbghelp_stubs.c
diff --git a/dll/win32/dciman32/CMakeLists.txt b/dll/win32/dciman32/CMakeLists.txt
index 9c49ebc046..5cd47dbec9 100644
--- a/dll/win32/dciman32/CMakeLists.txt
+++ b/dll/win32/dciman32/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/dciman32_stubs.c
${CMAKE_CURRENT_BINARY_DIR}/dciman32.def)
-add_library(dciman32 SHARED ${SOURCE})
+add_library(dciman32 MODULE ${SOURCE})
set_module_type(dciman32 win32dll)
target_link_libraries(dciman32 wine)
add_importlibs(dciman32 msvcrt kernel32 ntdll)
diff --git a/dll/win32/devmgr/CMakeLists.txt b/dll/win32/devmgr/CMakeLists.txt
index ae68d9d244..44ba6f4cff 100644
--- a/dll/win32/devmgr/CMakeLists.txt
+++ b/dll/win32/devmgr/CMakeLists.txt
@@ -29,7 +29,7 @@ list(APPEND SOURCE
devmgmt/Node.cpp
devmgmt/RootNode.cpp)
-add_library(devmgr SHARED
+add_library(devmgr MODULE
${SOURCE}
devmgr.rc
${CMAKE_CURRENT_BINARY_DIR}/devmgr.def)
diff --git a/dll/win32/dnsapi/CMakeLists.txt b/dll/win32/dnsapi/CMakeLists.txt
index 62aacebcd1..89b47e370c 100644
--- a/dll/win32/dnsapi/CMakeLists.txt
+++ b/dll/win32/dnsapi/CMakeLists.txt
@@ -17,7 +17,7 @@ list(APPEND SOURCE
dnsapi/stubs.c
dnsapi/precomp.h)
-add_library(dnsapi SHARED
+add_library(dnsapi MODULE
${SOURCE}
dnsapi.rc
${CMAKE_CURRENT_BINARY_DIR}/dnsapi.def)
diff --git a/dll/win32/esent/CMakeLists.txt b/dll/win32/esent/CMakeLists.txt
index 67ca4becd7..aab373fe80 100644
--- a/dll/win32/esent/CMakeLists.txt
+++ b/dll/win32/esent/CMakeLists.txt
@@ -4,7 +4,7 @@ spec2def(esent.dll esent.spec)
list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/esent_stubs.c)
-add_library(esent SHARED
+add_library(esent MODULE
${SOURCE}
${CMAKE_CURRENT_BINARY_DIR}/esent.def)
diff --git a/dll/win32/faultrep/CMakeLists.txt b/dll/win32/faultrep/CMakeLists.txt
index ea1a14983f..a5172103fe 100644
--- a/dll/win32/faultrep/CMakeLists.txt
+++ b/dll/win32/faultrep/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/faultrep_stubs.c
${CMAKE_CURRENT_BINARY_DIR}/faultrep.def)
-add_library(faultrep SHARED ${SOURCE})
+add_library(faultrep MODULE ${SOURCE})
set_module_type(faultrep win32dll)
target_link_libraries(faultrep wine)
add_importlibs(faultrep advapi32 msvcrt kernel32 ntdll)
diff --git a/dll/win32/fltlib/CMakeLists.txt b/dll/win32/fltlib/CMakeLists.txt
index 1cb7300a13..7b4320ad69 100644
--- a/dll/win32/fltlib/CMakeLists.txt
+++ b/dll/win32/fltlib/CMakeLists.txt
@@ -13,7 +13,7 @@ list(APPEND SOURCE
stubs.c
${CMAKE_CURRENT_BINARY_DIR}/fltlib.def)
-add_library(fltlib SHARED ${SOURCE} rsrc.rc)
+add_library(fltlib MODULE ${SOURCE} rsrc.rc)
set_module_type(fltlib win32dll)
target_link_libraries(fltlib wine)
add_target_compile_definitions(fltlib NTDDI_VERSION=NTDDI_WS03SP1)
diff --git a/dll/win32/fmifs/CMakeLists.txt b/dll/win32/fmifs/CMakeLists.txt
index 5289094d51..41cac2847a 100644
--- a/dll/win32/fmifs/CMakeLists.txt
+++ b/dll/win32/fmifs/CMakeLists.txt
@@ -12,7 +12,7 @@ list(APPEND SOURCE
query.c
precomp.h)
-add_library(fmifs SHARED
+add_library(fmifs MODULE
${SOURCE}
fmifs.rc
${CMAKE_CURRENT_BINARY_DIR}/fmifs_stubs.c
diff --git a/dll/win32/fontsub/CMakeLists.txt b/dll/win32/fontsub/CMakeLists.txt
index 3adf7c4215..1e801ffd6f 100644
--- a/dll/win32/fontsub/CMakeLists.txt
+++ b/dll/win32/fontsub/CMakeLists.txt
@@ -3,7 +3,7 @@ add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
spec2def(fontsub.dll fontsub.spec)
-add_library(fontsub SHARED
+add_library(fontsub MODULE
main.c
${CMAKE_CURRENT_BINARY_DIR}/fontsub_stubs.c
${CMAKE_CURRENT_BINARY_DIR}/fontsub.def)
diff --git a/dll/win32/framedyn/CMakeLists.txt b/dll/win32/framedyn/CMakeLists.txt
index 74a083df6f..edc6ab7c7c 100644
--- a/dll/win32/framedyn/CMakeLists.txt
+++ b/dll/win32/framedyn/CMakeLists.txt
@@ -12,7 +12,7 @@ if(MSVC)
add_compile_flags("/Zc:wchar_t-")
endif()
-add_library(framedyn SHARED ${SOURCE})
+add_library(framedyn MODULE ${SOURCE})
set_module_type(framedyn win32dll UNICODE)
add_importlibs(framedyn oleaut32 msvcrt kernel32 ntdll)
add_cd_file(TARGET framedyn DESTINATION reactos/system32/wbem FOR all)
diff --git a/dll/win32/fusion/CMakeLists.txt b/dll/win32/fusion/CMakeLists.txt
index fcaa5c23f6..7e151d9db5 100644
--- a/dll/win32/fusion/CMakeLists.txt
+++ b/dll/win32/fusion/CMakeLists.txt
@@ -15,7 +15,7 @@ list(APPEND COMMON_SOURCE
add_library(fusion_common STATIC ${COMMON_SOURCE})
add_dependencies(fusion_common psdk)
-add_library(fusion SHARED
+add_library(fusion MODULE
version.rc
${CMAKE_CURRENT_BINARY_DIR}/fusion.def)
diff --git a/dll/win32/fusion/fusion_1_1/CMakeLists.txt
b/dll/win32/fusion/fusion_1_1/CMakeLists.txt
index 5027b0afbe..802fecf8c3 100644
--- a/dll/win32/fusion/fusion_1_1/CMakeLists.txt
+++ b/dll/win32/fusion/fusion_1_1/CMakeLists.txt
@@ -2,7 +2,7 @@
set(fusion_folder "${CMAKE_CURRENT_SOURCE_DIR}/..")
spec2def(fusion.dll fusion.spec)
-add_library(fusion_1_1 SHARED
+add_library(fusion_1_1 MODULE
${fusion_folder}/version.rc
${CMAKE_CURRENT_BINARY_DIR}/fusion.def)
diff --git a/dll/win32/fusion/fusion_2_0/CMakeLists.txt
b/dll/win32/fusion/fusion_2_0/CMakeLists.txt
index c86f19268c..035da8ed61 100644
--- a/dll/win32/fusion/fusion_2_0/CMakeLists.txt
+++ b/dll/win32/fusion/fusion_2_0/CMakeLists.txt
@@ -2,7 +2,7 @@
set(fusion_folder "${CMAKE_CURRENT_SOURCE_DIR}/..")
spec2def(fusion.dll fusion.spec)
-add_library(fusion_2_0 SHARED
+add_library(fusion_2_0 MODULE
${fusion_folder}/version.rc
${CMAKE_CURRENT_BINARY_DIR}/fusion.def)
diff --git a/dll/win32/gdiplus/CMakeLists.txt b/dll/win32/gdiplus/CMakeLists.txt
index 58ef713dcb..172089123a 100644
--- a/dll/win32/gdiplus/CMakeLists.txt
+++ b/dll/win32/gdiplus/CMakeLists.txt
@@ -23,7 +23,7 @@ list(APPEND SOURCE
stringformat.c
precomp.h)
-add_library(gdiplus SHARED
+add_library(gdiplus MODULE
${SOURCE}
guid.c
gdiplus.rc
diff --git a/dll/win32/getuname/CMakeLists.txt b/dll/win32/getuname/CMakeLists.txt
index b97e7ab3bb..121c5d0299 100644
--- a/dll/win32/getuname/CMakeLists.txt
+++ b/dll/win32/getuname/CMakeLists.txt
@@ -2,7 +2,7 @@
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
spec2def(getuname.dll getuname.spec ADD_IMPORTLIB)
-add_library(getuname SHARED
+add_library(getuname MODULE
getuname.c
getuname.rc
${CMAKE_CURRENT_BINARY_DIR}/getuname.def)
diff --git a/dll/win32/hhctrl.ocx/CMakeLists.txt b/dll/win32/hhctrl.ocx/CMakeLists.txt
index 80b7975dca..103e58e97f 100644
--- a/dll/win32/hhctrl.ocx/CMakeLists.txt
+++ b/dll/win32/hhctrl.ocx/CMakeLists.txt
@@ -17,7 +17,7 @@ list(APPEND SOURCE
webbrowser.c
precomp.h)
-add_library(hhctrl SHARED
+add_library(hhctrl MODULE
${SOURCE}
guid.c
hhctrl.rc
diff --git a/dll/win32/hid/CMakeLists.txt b/dll/win32/hid/CMakeLists.txt
index 9e966ec9a9..edc34638fa 100644
--- a/dll/win32/hid/CMakeLists.txt
+++ b/dll/win32/hid/CMakeLists.txt
@@ -6,7 +6,7 @@ list(APPEND SOURCE
stubs.c
precomp.h)
-add_library(hid SHARED
+add_library(hid MODULE
${SOURCE}
hid.rc
${CMAKE_CURRENT_BINARY_DIR}/hid.def)
diff --git a/dll/win32/hlink/CMakeLists.txt b/dll/win32/hlink/CMakeLists.txt
index 7ce9922751..29ae5f99da 100644
--- a/dll/win32/hlink/CMakeLists.txt
+++ b/dll/win32/hlink/CMakeLists.txt
@@ -10,7 +10,7 @@ list(APPEND SOURCE
link.c
precomp.h)
-add_library(hlink SHARED
+add_library(hlink MODULE
${SOURCE}
hlink.rc
${CMAKE_CURRENT_BINARY_DIR}/hlink_stubs.c
diff --git a/dll/win32/hnetcfg/CMakeLists.txt b/dll/win32/hnetcfg/CMakeLists.txt
index fd3ab10d92..4e75ba685e 100644
--- a/dll/win32/hnetcfg/CMakeLists.txt
+++ b/dll/win32/hnetcfg/CMakeLists.txt
@@ -13,7 +13,7 @@ list(APPEND SOURCE
service.c
precomp.h)
-add_library(hnetcfg SHARED
+add_library(hnetcfg MODULE
${SOURCE}
hnetcfg.rc
${CMAKE_CURRENT_BINARY_DIR}/hnetcfg.def)
diff --git a/dll/win32/httpapi/CMakeLists.txt b/dll/win32/httpapi/CMakeLists.txt
index 96b40b1bbb..5836ccc545 100644
--- a/dll/win32/httpapi/CMakeLists.txt
+++ b/dll/win32/httpapi/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/httpapi_stubs.c
${CMAKE_CURRENT_BINARY_DIR}/httpapi.def)
-add_library(httpapi SHARED ${SOURCE})
+add_library(httpapi MODULE ${SOURCE})
set_module_type(httpapi win32dll)
target_link_libraries(httpapi wine)
add_importlibs(httpapi msvcrt kernel32 ntdll)
diff --git a/dll/win32/iccvid/CMakeLists.txt b/dll/win32/iccvid/CMakeLists.txt
index cfcfd6ba32..68dc7057a1 100644
--- a/dll/win32/iccvid/CMakeLists.txt
+++ b/dll/win32/iccvid/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
iccvid.c
${CMAKE_CURRENT_BINARY_DIR}/iccvid.def)
-add_library(iccvid SHARED ${SOURCE} rsrc.rc)
+add_library(iccvid MODULE ${SOURCE} rsrc.rc)
set_module_type(iccvid win32dll)
target_link_libraries(iccvid wine)
add_importlibs(iccvid user32 msvcrt kernel32 ntdll)
diff --git a/dll/win32/icmp/CMakeLists.txt b/dll/win32/icmp/CMakeLists.txt
index d36a089065..18c7a3a2b5 100644
--- a/dll/win32/icmp/CMakeLists.txt
+++ b/dll/win32/icmp/CMakeLists.txt
@@ -6,7 +6,7 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/icmp_stubs.c
${CMAKE_CURRENT_BINARY_DIR}/icmp.def)
-add_library(icmp SHARED ${SOURCE})
+add_library(icmp MODULE ${SOURCE})
set_module_type(icmp win32dll)
add_importlibs(icmp iphlpapi msvcrt kernel32 ntdll)
add_cd_file(TARGET icmp DESTINATION reactos/system32 FOR all)
diff --git a/dll/win32/ieframe/CMakeLists.txt b/dll/win32/ieframe/CMakeLists.txt
index bf7b6034cd..cdd58efb6e 100644
--- a/dll/win32/ieframe/CMakeLists.txt
+++ b/dll/win32/ieframe/CMakeLists.txt
@@ -25,7 +25,7 @@ list(APPEND SOURCE
precomp.h
${CMAKE_CURRENT_BINARY_DIR}/ieframe_stubs.c)
-add_library(ieframe SHARED
+add_library(ieframe MODULE
${SOURCE}
ieframe.rc
${CMAKE_CURRENT_BINARY_DIR}/ieframe.def)
diff --git a/dll/win32/iernonce/CMakeLists.txt b/dll/win32/iernonce/CMakeLists.txt
index 7308f9a28f..85b73cdf6e 100644
--- a/dll/win32/iernonce/CMakeLists.txt
+++ b/dll/win32/iernonce/CMakeLists.txt
@@ -1,7 +1,7 @@
spec2def(iernonce.dll iernonce.spec)
-add_library(iernonce SHARED
+add_library(iernonce MODULE
iernonce.c
iernonce.rc
${CMAKE_CURRENT_BINARY_DIR}/iernonce.def)
diff --git a/dll/win32/imaadp32.acm/CMakeLists.txt
b/dll/win32/imaadp32.acm/CMakeLists.txt
index 01d7d55060..fa6e30a247 100644
--- a/dll/win32/imaadp32.acm/CMakeLists.txt
+++ b/dll/win32/imaadp32.acm/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
imaadp32.c
${CMAKE_CURRENT_BINARY_DIR}/imaadp32.def)
-add_library(imaadp32.acm SHARED ${SOURCE})
+add_library(imaadp32.acm MODULE ${SOURCE})
set_module_type(imaadp32.acm win32dll)
set_target_properties(imaadp32.acm PROPERTIES SUFFIX "")
target_link_libraries(imaadp32.acm wine)
diff --git a/dll/win32/imagehlp/CMakeLists.txt b/dll/win32/imagehlp/CMakeLists.txt
index 5284f85816..d39f1b45be 100644
--- a/dll/win32/imagehlp/CMakeLists.txt
+++ b/dll/win32/imagehlp/CMakeLists.txt
@@ -10,7 +10,7 @@ list(APPEND SOURCE
modify.c
precomp.h)
-add_library(imagehlp SHARED
+add_library(imagehlp MODULE
${SOURCE}
imagehlp.rc
${CMAKE_CURRENT_BINARY_DIR}/imagehlp_stubs.c
diff --git a/dll/win32/imm32/CMakeLists.txt b/dll/win32/imm32/CMakeLists.txt
index 91368f84e4..01eec2a490 100644
--- a/dll/win32/imm32/CMakeLists.txt
+++ b/dll/win32/imm32/CMakeLists.txt
@@ -12,7 +12,7 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/imm32_stubs.c
${CMAKE_CURRENT_BINARY_DIR}/imm32.def)
-add_library(imm32 SHARED ${SOURCE} version.rc)
+add_library(imm32 MODULE ${SOURCE} version.rc)
set_module_type(imm32 win32dll)
target_link_libraries(imm32 wine)
add_importlibs(imm32 advapi32 user32 msvcrt kernel32 ntdll)
diff --git a/dll/win32/inetcomm/CMakeLists.txt b/dll/win32/inetcomm/CMakeLists.txt
index c995faf2cc..3e60b9922a 100644
--- a/dll/win32/inetcomm/CMakeLists.txt
+++ b/dll/win32/inetcomm/CMakeLists.txt
@@ -14,7 +14,7 @@ list(APPEND SOURCE
smtptransport.c
precomp.h)
-add_library(inetcomm SHARED
+add_library(inetcomm MODULE
${SOURCE}
guid.c
inetcomm.rc
diff --git a/dll/win32/inetmib1/CMakeLists.txt b/dll/win32/inetmib1/CMakeLists.txt
index 0883fc36a1..08c1b0a83f 100644
--- a/dll/win32/inetmib1/CMakeLists.txt
+++ b/dll/win32/inetmib1/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/inetmib1_stubs.c
${CMAKE_CURRENT_BINARY_DIR}/inetmib1.def)
-add_library(inetmib1 SHARED ${SOURCE})
+add_library(inetmib1 MODULE ${SOURCE})
set_module_type(inetmib1 win32dll)
target_link_libraries(inetmib1 wine)
add_delay_importlibs(inetmib1 iphlpapi)
diff --git a/dll/win32/initpki/CMakeLists.txt b/dll/win32/initpki/CMakeLists.txt
index a811010ced..406ece9b3a 100644
--- a/dll/win32/initpki/CMakeLists.txt
+++ b/dll/win32/initpki/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/initpki_stubs.c
${CMAKE_CURRENT_BINARY_DIR}/initpki.def)
-add_library(initpki SHARED ${SOURCE})
+add_library(initpki MODULE ${SOURCE})
set_module_type(initpki win32dll)
target_link_libraries(initpki wine)
add_importlibs(initpki msvcrt kernel32 ntdll)
diff --git a/dll/win32/inseng/CMakeLists.txt b/dll/win32/inseng/CMakeLists.txt
index 20f27dfa4a..1ee71e5ffb 100644
--- a/dll/win32/inseng/CMakeLists.txt
+++ b/dll/win32/inseng/CMakeLists.txt
@@ -14,7 +14,7 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/inseng_stubs.c
${CMAKE_CURRENT_BINARY_DIR}/inseng.def)
-add_library(inseng SHARED ${SOURCE} guid.c inseng.rc)
+add_library(inseng MODULE ${SOURCE} guid.c inseng.rc)
set_module_type(inseng win32dll)
target_link_libraries(inseng uuid wine)
add_importlibs(inseng ole32 urlmon kernel32_vista msvcrt kernel32 ntdll)
diff --git a/dll/win32/iologmsg/CMakeLists.txt b/dll/win32/iologmsg/CMakeLists.txt
index 1a9b2de791..0e1f230fc1 100644
--- a/dll/win32/iologmsg/CMakeLists.txt
+++ b/dll/win32/iologmsg/CMakeLists.txt
@@ -1,5 +1,5 @@
-add_library(iologmsg SHARED iologmsg.rc)
+add_library(iologmsg MODULE iologmsg.rc)
set_module_type(iologmsg module UNICODE)
add_dependencies(iologmsg ntiologc)
add_cd_file(TARGET iologmsg DESTINATION reactos/system32 FOR all)
diff --git a/dll/win32/iphlpapi/CMakeLists.txt b/dll/win32/iphlpapi/CMakeLists.txt
index 3bdcb1f71e..61f9112d76 100644
--- a/dll/win32/iphlpapi/CMakeLists.txt
+++ b/dll/win32/iphlpapi/CMakeLists.txt
@@ -22,7 +22,7 @@ list(APPEND SOURCE
iphlpapi_private.h
${CMAKE_CURRENT_BINARY_DIR}/iphlpapi_stubs.c)
-add_library(iphlpapi SHARED
+add_library(iphlpapi MODULE
${SOURCE}
iphlpapi.rc
iphlpapi_fakestubs.c
diff --git a/dll/win32/itircl/CMakeLists.txt b/dll/win32/itircl/CMakeLists.txt
index bb246c1006..e6b3f6a6db 100644
--- a/dll/win32/itircl/CMakeLists.txt
+++ b/dll/win32/itircl/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/itircl_stubs.c
${CMAKE_CURRENT_BINARY_DIR}/itircl.def)
-add_library(itircl SHARED ${SOURCE})
+add_library(itircl MODULE ${SOURCE})
set_module_type(itircl win32dll)
target_link_libraries(itircl wine)
add_importlibs(itircl msvcrt kernel32 ntdll)
diff --git a/dll/win32/itss/CMakeLists.txt b/dll/win32/itss/CMakeLists.txt
index 0dbf58025d..63cefe61bf 100644
--- a/dll/win32/itss/CMakeLists.txt
+++ b/dll/win32/itss/CMakeLists.txt
@@ -12,7 +12,7 @@ list(APPEND SOURCE
storage.c
precomp.h)
-add_library(itss SHARED
+add_library(itss MODULE
${SOURCE}
guid.c
rsrc.rc
diff --git a/dll/win32/jscript/CMakeLists.txt b/dll/win32/jscript/CMakeLists.txt
index 5551ee74a1..40a48d570b 100644
--- a/dll/win32/jscript/CMakeLists.txt
+++ b/dll/win32/jscript/CMakeLists.txt
@@ -43,7 +43,7 @@ list(APPEND jscript_rc_deps
set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS
"${jscript_rc_deps}")
-add_library(jscript SHARED
+add_library(jscript MODULE
${SOURCE}
rsrc.rc
${CMAKE_CURRENT_BINARY_DIR}/jscript.def)
diff --git a/dll/win32/jsproxy/CMakeLists.txt b/dll/win32/jsproxy/CMakeLists.txt
index cec9a196d0..46ae1b7ecf 100644
--- a/dll/win32/jsproxy/CMakeLists.txt
+++ b/dll/win32/jsproxy/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/jsproxy_stubs.c
${CMAKE_CURRENT_BINARY_DIR}/jsproxy.def)
-add_library(jsproxy SHARED ${SOURCE} rsrc.rc)
+add_library(jsproxy MODULE ${SOURCE} rsrc.rc)
set_module_type(jsproxy win32dll)
target_link_libraries(jsproxy uuid wine)
add_importlibs(jsproxy oleaut32 ole32 ws2_32 msvcrt kernel32 ntdll)
diff --git a/dll/win32/kernel32/CMakeLists.txt b/dll/win32/kernel32/CMakeLists.txt
index 21a21829e7..22409a7605 100644
--- a/dll/win32/kernel32/CMakeLists.txt
+++ b/dll/win32/kernel32/CMakeLists.txt
@@ -98,7 +98,7 @@ elseif(ARCH STREQUAL "arm")
endif()
add_asm_files(kernel32_asm ${ASM_SOURCE})
-add_library(kernel32 SHARED
+add_library(kernel32 MODULE
${SOURCE}
${kernel32_asm}
kernel32.rc
diff --git a/dll/win32/kernel32_vista/CMakeLists.txt
b/dll/win32/kernel32_vista/CMakeLists.txt
index 4f1f09fb5d..068297a4a0 100644
--- a/dll/win32/kernel32_vista/CMakeLists.txt
+++ b/dll/win32/kernel32_vista/CMakeLists.txt
@@ -13,7 +13,7 @@ list(APPEND SOURCE
sync.c
${CMAKE_CURRENT_BINARY_DIR}/kernel32_vista.def)
-add_library(kernel32_vista SHARED ${SOURCE})
+add_library(kernel32_vista MODULE ${SOURCE})
set_module_type(kernel32_vista win32dll ENTRYPOINT DllMain 12)
add_importlibs(kernel32_vista kernel32 ntdll)
add_delay_importlibs(kernel32_vista ntdll_vista)
diff --git a/dll/win32/loadperf/CMakeLists.txt b/dll/win32/loadperf/CMakeLists.txt
index 21af6893f5..770b188ee9 100644
--- a/dll/win32/loadperf/CMakeLists.txt
+++ b/dll/win32/loadperf/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
stubs.c
${CMAKE_CURRENT_BINARY_DIR}/loadperf.def)
-add_library(loadperf SHARED ${SOURCE})
+add_library(loadperf MODULE ${SOURCE})
set_module_type(loadperf win32dll)
target_link_libraries(loadperf wine)
add_importlibs(loadperf msvcrt kernel32 ntdll)
diff --git a/dll/win32/lpk/CMakeLists.txt b/dll/win32/lpk/CMakeLists.txt
index 9f4c504cb0..5a21c6cdee 100644
--- a/dll/win32/lpk/CMakeLists.txt
+++ b/dll/win32/lpk/CMakeLists.txt
@@ -9,7 +9,7 @@ list(APPEND SOURCE
stub.c
ros_lpk.h)
-add_library(lpk SHARED
+add_library(lpk MODULE
${SOURCE}
lpk.rc
${CMAKE_CURRENT_BINARY_DIR}/lpk.def)
diff --git a/dll/win32/lsasrv/CMakeLists.txt b/dll/win32/lsasrv/CMakeLists.txt
index 13d3ab4398..8ea8fe511b 100644
--- a/dll/win32/lsasrv/CMakeLists.txt
+++ b/dll/win32/lsasrv/CMakeLists.txt
@@ -31,7 +31,7 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/lsa_s.c
${CMAKE_CURRENT_BINARY_DIR}/lsasrv_stubs.c)
-add_library(lsasrv SHARED
+add_library(lsasrv MODULE
${SOURCE}
lsasrv.rc
${CMAKE_CURRENT_BINARY_DIR}/lsasrv.def)
diff --git a/dll/win32/lz32/CMakeLists.txt b/dll/win32/lz32/CMakeLists.txt
index c3b45fc46a..cbad018bf8 100644
--- a/dll/win32/lz32/CMakeLists.txt
+++ b/dll/win32/lz32/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
version.rc
${CMAKE_CURRENT_BINARY_DIR}/lz32.def)
-add_library(lz32 SHARED ${SOURCE})
+add_library(lz32 MODULE ${SOURCE})
set_module_type(lz32 win32dll ENTRYPOINT 0 )
target_link_libraries(lz32 wine)
add_importlibs(lz32 kernel32 ntdll)
diff --git a/dll/win32/mapi32/CMakeLists.txt b/dll/win32/mapi32/CMakeLists.txt
index 34677e5423..18da64dfec 100644
--- a/dll/win32/mapi32/CMakeLists.txt
+++ b/dll/win32/mapi32/CMakeLists.txt
@@ -12,7 +12,7 @@ list(APPEND SOURCE
util.c
precomp.h)
-add_library(mapi32 SHARED
+add_library(mapi32 MODULE
${SOURCE}
guid.c
version.rc
diff --git a/dll/win32/mciavi32/CMakeLists.txt b/dll/win32/mciavi32/CMakeLists.txt
index bc6251076b..3f49fc1175 100644
--- a/dll/win32/mciavi32/CMakeLists.txt
+++ b/dll/win32/mciavi32/CMakeLists.txt
@@ -10,7 +10,7 @@ list(APPEND SOURCE
wnd.c
precomp.h)
-add_library(mciavi32 SHARED
+add_library(mciavi32 MODULE
${SOURCE}
mciavi_res.rc
${CMAKE_CURRENT_BINARY_DIR}/mciavi32.def)
diff --git a/dll/win32/mcicda/CMakeLists.txt b/dll/win32/mcicda/CMakeLists.txt
index 76e10c61a3..17db5b8487 100644
--- a/dll/win32/mcicda/CMakeLists.txt
+++ b/dll/win32/mcicda/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
mcicda.c
${CMAKE_CURRENT_BINARY_DIR}/mcicda.def)
-add_library(mcicda SHARED ${SOURCE})
+add_library(mcicda MODULE ${SOURCE})
set_module_type(mcicda win32dll)
target_link_libraries(mcicda wine)
add_importlibs(mcicda winmm user32 msvcrt kernel32 ntdll)
diff --git a/dll/win32/mciqtz32/CMakeLists.txt b/dll/win32/mciqtz32/CMakeLists.txt
index a7e4d511ee..88e92f6c4d 100644
--- a/dll/win32/mciqtz32/CMakeLists.txt
+++ b/dll/win32/mciqtz32/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
mciqtz.c
${CMAKE_CURRENT_BINARY_DIR}/mciqtz32.def)
-add_library(mciqtz32 SHARED ${SOURCE} mciavi_res.rc)
+add_library(mciqtz32 MODULE ${SOURCE} mciavi_res.rc)
set_module_type(mciqtz32 win32dll)
target_link_libraries(mciqtz32 wine strmiids)
add_importlibs(mciqtz32 winmm ole32 user32 gdi32 msvcrt kernel32 ntdll)
diff --git a/dll/win32/mciseq/CMakeLists.txt b/dll/win32/mciseq/CMakeLists.txt
index 6630d33e04..62b3f54b34 100644
--- a/dll/win32/mciseq/CMakeLists.txt
+++ b/dll/win32/mciseq/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
mcimidi.c
${CMAKE_CURRENT_BINARY_DIR}/mciseq.def)
-add_library(mciseq SHARED ${SOURCE})
+add_library(mciseq MODULE ${SOURCE})
set_module_type(mciseq win32dll)
target_link_libraries(mciseq wine)
add_importlibs(mciseq winmm user32 msvcrt kernel32 ntdll)
diff --git a/dll/win32/mciwave/CMakeLists.txt b/dll/win32/mciwave/CMakeLists.txt
index 05c779109e..e4b06aa0d2 100644
--- a/dll/win32/mciwave/CMakeLists.txt
+++ b/dll/win32/mciwave/CMakeLists.txt
@@ -10,7 +10,7 @@ list(APPEND SOURCE
mciwave.c
${CMAKE_CURRENT_BINARY_DIR}/mciwave.def)
-add_library(mciwave SHARED ${SOURCE})
+add_library(mciwave MODULE ${SOURCE})
set_module_type(mciwave win32dll)
target_link_libraries(mciwave wine)
add_importlibs(mciwave user32 winmm msvcrt kernel32 ntdll)
diff --git a/dll/win32/mgmtapi/CMakeLists.txt b/dll/win32/mgmtapi/CMakeLists.txt
index 0659c584f0..c2d5ce1118 100644
--- a/dll/win32/mgmtapi/CMakeLists.txt
+++ b/dll/win32/mgmtapi/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/mgmtapi_stubs.c
${CMAKE_CURRENT_BINARY_DIR}/mgmtapi.def)
-add_library(mgmtapi SHARED ${SOURCE})
+add_library(mgmtapi MODULE ${SOURCE})
set_module_type(mgmtapi win32dll)
target_link_libraries(mgmtapi wine)
add_importlibs(mgmtapi msvcrt kernel32 ntdll)
diff --git a/dll/win32/mlang/CMakeLists.txt b/dll/win32/mlang/CMakeLists.txt
index 5592c23e5a..0afca92b55 100644
--- a/dll/win32/mlang/CMakeLists.txt
+++ b/dll/win32/mlang/CMakeLists.txt
@@ -11,7 +11,7 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/mlang_stubs.c
${CMAKE_CURRENT_BINARY_DIR}/mlang.def)
-add_library(mlang SHARED ${SOURCE} mlang.rc)
+add_library(mlang MODULE ${SOURCE} mlang.rc)
set_module_type(mlang win32dll UNICODE)
target_link_libraries(mlang uuid wine)
add_delay_importlibs(mlang oleaut32)
diff --git a/dll/win32/mmdevapi/CMakeLists.txt b/dll/win32/mmdevapi/CMakeLists.txt
index 5d4245ca09..1cda15a8c5 100644
--- a/dll/win32/mmdevapi/CMakeLists.txt
+++ b/dll/win32/mmdevapi/CMakeLists.txt
@@ -13,7 +13,7 @@ list(APPEND SOURCE
precomp.h
${CMAKE_CURRENT_BINARY_DIR}/mmdevapi_stubs.c)
-add_library(mmdevapi SHARED
+add_library(mmdevapi MODULE
${SOURCE}
guid.c
mmdevapi.rc
diff --git a/dll/win32/mmdrv/CMakeLists.txt b/dll/win32/mmdrv/CMakeLists.txt
index fa6f6ce17f..17d7e92c9b 100644
--- a/dll/win32/mmdrv/CMakeLists.txt
+++ b/dll/win32/mmdrv/CMakeLists.txt
@@ -11,7 +11,7 @@ list(APPEND SOURCE
wave_io.c
mmdrv.h)
-add_library(mmdrv SHARED
+add_library(mmdrv MODULE
${SOURCE}
${CMAKE_CURRENT_BINARY_DIR}/mmdrv.def)
diff --git a/dll/win32/modemui/CMakeLists.txt b/dll/win32/modemui/CMakeLists.txt
index 3953a52f4f..ead0401d7c 100644
--- a/dll/win32/modemui/CMakeLists.txt
+++ b/dll/win32/modemui/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/modemui_stubs.c
${CMAKE_CURRENT_BINARY_DIR}/modemui.def)
-add_library(modemui SHARED ${SOURCE})
+add_library(modemui MODULE ${SOURCE})
set_module_type(modemui win32dll UNICODE)
add_importlibs(modemui msvcrt kernel32 ntdll)
add_cd_file(TARGET modemui DESTINATION reactos/system32 FOR all)
diff --git a/dll/win32/mpr/CMakeLists.txt b/dll/win32/mpr/CMakeLists.txt
index 28c76f8881..af182ae042 100644
--- a/dll/win32/mpr/CMakeLists.txt
+++ b/dll/win32/mpr/CMakeLists.txt
@@ -16,7 +16,7 @@ list(APPEND SOURCE
precomp.h
${CMAKE_CURRENT_BINARY_DIR}/mpr_stubs.c)
-add_library(mpr SHARED
+add_library(mpr MODULE
${SOURCE}
mpr.rc
${CMAKE_CURRENT_BINARY_DIR}/mpr.def)
diff --git a/dll/win32/mprapi/CMakeLists.txt b/dll/win32/mprapi/CMakeLists.txt
index 607624dc63..17a1a1b404 100644
--- a/dll/win32/mprapi/CMakeLists.txt
+++ b/dll/win32/mprapi/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/mprapi_stubs.c
${CMAKE_CURRENT_BINARY_DIR}/mprapi.def)
-add_library(mprapi SHARED ${SOURCE})
+add_library(mprapi MODULE ${SOURCE})
set_module_type(mprapi win32dll)
target_link_libraries(mprapi wine)
add_importlibs(mprapi msvcrt kernel32 ntdll)
diff --git a/dll/win32/msacm32.drv/CMakeLists.txt b/dll/win32/msacm32.drv/CMakeLists.txt
index ed542d99b5..3964c91626 100644
--- a/dll/win32/msacm32.drv/CMakeLists.txt
+++ b/dll/win32/msacm32.drv/CMakeLists.txt
@@ -2,7 +2,7 @@
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
spec2def(msacm32.drv msacm32.drv.spec)
-add_library(msacm32.drv SHARED
+add_library(msacm32.drv MODULE
wavemap.c
wavemap.rc
${CMAKE_CURRENT_BINARY_DIR}/msacm32.def)
diff --git a/dll/win32/msacm32/CMakeLists.txt b/dll/win32/msacm32/CMakeLists.txt
index b1be7b9b48..822bb649b5 100644
--- a/dll/win32/msacm32/CMakeLists.txt
+++ b/dll/win32/msacm32/CMakeLists.txt
@@ -14,7 +14,7 @@ list(APPEND SOURCE
precomp.h
${CMAKE_CURRENT_BINARY_DIR}/msacm32_stubs.c)
-add_library(msacm32 SHARED
+add_library(msacm32 MODULE
${SOURCE}
msacm.rc
${CMAKE_CURRENT_BINARY_DIR}/msacm32.def)
diff --git a/dll/win32/msadp32.acm/CMakeLists.txt b/dll/win32/msadp32.acm/CMakeLists.txt
index 3333e4182f..f784c6c60d 100644
--- a/dll/win32/msadp32.acm/CMakeLists.txt
+++ b/dll/win32/msadp32.acm/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
msadp32.c
${CMAKE_CURRENT_BINARY_DIR}/msadp32.def)
-add_library(msadp32.acm SHARED ${SOURCE})
+add_library(msadp32.acm MODULE ${SOURCE})
set_module_type(msadp32.acm win32dll)
set_target_properties(msadp32.acm PROPERTIES SUFFIX "")
target_link_libraries(msadp32.acm wine)
diff --git a/dll/win32/msafd/CMakeLists.txt b/dll/win32/msafd/CMakeLists.txt
index db60e83f42..14f97943bf 100644
--- a/dll/win32/msafd/CMakeLists.txt
+++ b/dll/win32/msafd/CMakeLists.txt
@@ -12,7 +12,7 @@ list(APPEND SOURCE
misc/stubs.c
msafd.h)
-add_library(msafd SHARED
+add_library(msafd MODULE
${SOURCE}
msafd.rc
${CMAKE_CURRENT_BINARY_DIR}/msafd.def)
diff --git a/dll/win32/mscat32/CMakeLists.txt b/dll/win32/mscat32/CMakeLists.txt
index d7471d99ea..94788acc58 100644
--- a/dll/win32/mscat32/CMakeLists.txt
+++ b/dll/win32/mscat32/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
main.c
${CMAKE_CURRENT_BINARY_DIR}/mscat32.def)
-add_library(mscat32 SHARED ${SOURCE})
+add_library(mscat32 MODULE ${SOURCE})
set_module_type(mscat32 win32dll)
target_link_libraries(mscat32 wine)
add_importlibs(mscat32 wintrust msvcrt kernel32 ntdll)
diff --git a/dll/win32/mscms/CMakeLists.txt b/dll/win32/mscms/CMakeLists.txt
index 89126cd4ee..785e1e425d 100644
--- a/dll/win32/mscms/CMakeLists.txt
+++ b/dll/win32/mscms/CMakeLists.txt
@@ -13,7 +13,7 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/mscms_stubs.c
${CMAKE_CURRENT_BINARY_DIR}/mscms.def)
-add_library(mscms SHARED ${SOURCE} version.rc)
+add_library(mscms MODULE ${SOURCE} version.rc)
set_module_type(mscms win32dll)
target_link_libraries(mscms wine)
add_importlibs(mscms advapi32 msvcrt kernel32 ntdll)
diff --git a/dll/win32/mscoree/CMakeLists.txt b/dll/win32/mscoree/CMakeLists.txt
index f39b9bb230..8cba945664 100644
--- a/dll/win32/mscoree/CMakeLists.txt
+++ b/dll/win32/mscoree/CMakeLists.txt
@@ -16,7 +16,7 @@ list(APPEND SOURCE
mscoree_main.c
mscoree_private.h)
-add_library(mscoree SHARED
+add_library(mscoree MODULE
${SOURCE}
guid.c
mscoree.rc
diff --git a/dll/win32/msctf/CMakeLists.txt b/dll/win32/msctf/CMakeLists.txt
index 02e172ac43..d7ae222c8d 100644
--- a/dll/win32/msctf/CMakeLists.txt
+++ b/dll/win32/msctf/CMakeLists.txt
@@ -20,7 +20,7 @@ list(APPEND SOURCE
precomp.h
${CMAKE_CURRENT_BINARY_DIR}/msctf_stubs.c)
-add_library(msctf SHARED
+add_library(msctf MODULE
${SOURCE}
version.rc
${CMAKE_CURRENT_BINARY_DIR}/msctf.def)
diff --git a/dll/win32/msftedit/CMakeLists.txt b/dll/win32/msftedit/CMakeLists.txt
index 1b37a69abb..8fba4ccd08 100644
--- a/dll/win32/msftedit/CMakeLists.txt
+++ b/dll/win32/msftedit/CMakeLists.txt
@@ -9,7 +9,7 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/msftedit_stubs.c
${CMAKE_CURRENT_BINARY_DIR}/msftedit.def)
-add_library(msftedit SHARED ${SOURCE})
+add_library(msftedit MODULE ${SOURCE})
set_module_type(msftedit win32dll)
target_link_libraries(msftedit uuid wine)
add_importlibs(msftedit riched20 msvcrt kernel32 ntdll)
diff --git a/dll/win32/msg711.acm/CMakeLists.txt b/dll/win32/msg711.acm/CMakeLists.txt
index 3796e5ef99..3dc5c79492 100644
--- a/dll/win32/msg711.acm/CMakeLists.txt
+++ b/dll/win32/msg711.acm/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
msg711.c
${CMAKE_CURRENT_BINARY_DIR}/msg711.def)
-add_library(msg711.acm SHARED ${SOURCE})
+add_library(msg711.acm MODULE ${SOURCE})
set_module_type(msg711.acm win32dll)
set_target_properties(msg711.acm PROPERTIES SUFFIX "")
target_link_libraries(msg711.acm wine)
diff --git a/dll/win32/msgina/CMakeLists.txt b/dll/win32/msgina/CMakeLists.txt
index 7c6b5618f2..1cfa45f808 100644
--- a/dll/win32/msgina/CMakeLists.txt
+++ b/dll/win32/msgina/CMakeLists.txt
@@ -19,7 +19,7 @@ list(APPEND C_SOURCE
list(APPEND CPP_SOURCE
dimmedwindow.cpp)
-add_library(msgina SHARED
+add_library(msgina MODULE
${C_SOURCE}
${CPP_SOURCE}
msgina.rc
diff --git a/dll/win32/msgsm32.acm/CMakeLists.txt b/dll/win32/msgsm32.acm/CMakeLists.txt
index b7683bd2b4..5a0238ceef 100644
--- a/dll/win32/msgsm32.acm/CMakeLists.txt
+++ b/dll/win32/msgsm32.acm/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
msgsm32.c
${CMAKE_CURRENT_BINARY_DIR}/msgsm32.def)
-add_library(msgsm32.acm SHARED ${SOURCE})
+add_library(msgsm32.acm MODULE ${SOURCE})
set_module_type(msgsm32.acm win32dll)
set_target_properties(msgsm32.acm PROPERTIES SUFFIX "")
target_link_libraries(msgsm32.acm wine)
diff --git a/dll/win32/mshtml.tlb/CMakeLists.txt b/dll/win32/mshtml.tlb/CMakeLists.txt
index d928b5368b..c795544636 100644
--- a/dll/win32/mshtml.tlb/CMakeLists.txt
+++ b/dll/win32/mshtml.tlb/CMakeLists.txt
@@ -2,7 +2,7 @@
add_typelib(mshtml_tlb.idl)
add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
-add_library(mshtml.tlb SHARED rsrc.rc)
+add_library(mshtml.tlb MODULE rsrc.rc)
list(APPEND mshtml_tlb_rc_deps
${CMAKE_CURRENT_BINARY_DIR}/mshtml_tlb.tlb
diff --git a/dll/win32/mshtml/CMakeLists.txt b/dll/win32/mshtml/CMakeLists.txt
index 1b93bfa575..e89b34b5ae 100644
--- a/dll/win32/mshtml/CMakeLists.txt
+++ b/dll/win32/mshtml/CMakeLists.txt
@@ -89,7 +89,7 @@ if(MSVC)
add_asm_files(mshtml_asm msvc.S)
endif()
-add_library(mshtml SHARED
+add_library(mshtml MODULE
${SOURCE}
${mshtml_asm}
guid.c
diff --git a/dll/win32/msi/CMakeLists.txt b/dll/win32/msi/CMakeLists.txt
index 3eaee0fefa..b2e6bf72f7 100644
--- a/dll/win32/msi/CMakeLists.txt
+++ b/dll/win32/msi/CMakeLists.txt
@@ -51,7 +51,7 @@ list(APPEND SOURCE
where.c
precomp.h)
-add_library(msi SHARED
+add_library(msi MODULE
${SOURCE}
${CMAKE_CURRENT_BINARY_DIR}/msiserver_i.c
${CMAKE_CURRENT_BINARY_DIR}/msi_stubs.c
diff --git a/dll/win32/msimg32/CMakeLists.txt b/dll/win32/msimg32/CMakeLists.txt
index 6291b36670..c55790ef35 100644
--- a/dll/win32/msimg32/CMakeLists.txt
+++ b/dll/win32/msimg32/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
msimg32_main.c
${CMAKE_CURRENT_BINARY_DIR}/msimg32.def)
-add_library(msimg32 SHARED ${SOURCE})
+add_library(msimg32 MODULE ${SOURCE})
set_module_type(msimg32 win32dll)
target_link_libraries(msimg32 wine)
add_importlibs(msimg32 gdi32 msvcrt kernel32 ntdll)
diff --git a/dll/win32/msimtf/CMakeLists.txt b/dll/win32/msimtf/CMakeLists.txt
index a1c28dafcd..567159de07 100644
--- a/dll/win32/msimtf/CMakeLists.txt
+++ b/dll/win32/msimtf/CMakeLists.txt
@@ -9,7 +9,7 @@ list(APPEND SOURCE
precomp.h
${CMAKE_CURRENT_BINARY_DIR}/msimtf_stubs.c)
-add_library(msimtf SHARED
+add_library(msimtf MODULE
${SOURCE}
rsrc.rc
${CMAKE_CURRENT_BINARY_DIR}/msimtf.def)
diff --git a/dll/win32/msisip/CMakeLists.txt b/dll/win32/msisip/CMakeLists.txt
index 76aff6775d..3a194e7bc1 100644
--- a/dll/win32/msisip/CMakeLists.txt
+++ b/dll/win32/msisip/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/msisip_stubs.c
${CMAKE_CURRENT_BINARY_DIR}/msisip.def)
-add_library(msisip SHARED ${SOURCE})
+add_library(msisip MODULE ${SOURCE})
set_module_type(msisip win32dll)
target_link_libraries(msisip wine)
add_importlibs(msisip crypt32 ole32 msvcrt kernel32 ntdll)
diff --git a/dll/win32/msisys.ocx/CMakeLists.txt b/dll/win32/msisys.ocx/CMakeLists.txt
index c9e17b553e..0d711a5817 100644
--- a/dll/win32/msisys.ocx/CMakeLists.txt
+++ b/dll/win32/msisys.ocx/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
msisys.c
${CMAKE_CURRENT_BINARY_DIR}/msisys.def)
-add_library(msisys SHARED ${SOURCE})
+add_library(msisys MODULE ${SOURCE})
set_module_type(msisys win32ocx)
target_link_libraries(msisys wine)
add_importlibs(msisys msvcrt kernel32 ntdll)
diff --git a/dll/win32/msnet32/CMakeLists.txt b/dll/win32/msnet32/CMakeLists.txt
index 3bb042403d..c8a5c5a2f5 100644
--- a/dll/win32/msnet32/CMakeLists.txt
+++ b/dll/win32/msnet32/CMakeLists.txt
@@ -2,7 +2,7 @@
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
add_definitions(-D__WINESRC__)
spec2def(msnet32.dll msnet32.spec)
-add_library(msnet32 SHARED msnet_main.c ${CMAKE_CURRENT_BINARY_DIR}/msnet32.def)
+add_library(msnet32 MODULE msnet_main.c ${CMAKE_CURRENT_BINARY_DIR}/msnet32.def)
set_module_type(msnet32 win32dll)
target_link_libraries(msnet32 wine)
add_importlibs(msnet32 msvcrt kernel32 ntdll)
diff --git a/dll/win32/mspatcha/CMakeLists.txt b/dll/win32/mspatcha/CMakeLists.txt
index 3c21db607d..129eebdca5 100644
--- a/dll/win32/mspatcha/CMakeLists.txt
+++ b/dll/win32/mspatcha/CMakeLists.txt
@@ -10,7 +10,7 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/mspatcha_stubs.c
${CMAKE_CURRENT_BINARY_DIR}/mspatcha.def)
-add_library(mspatcha SHARED ${SOURCE} version.rc)
+add_library(mspatcha MODULE ${SOURCE} version.rc)
set_module_type(mspatcha win32dll)
target_link_libraries(mspatcha wine)
add_importlibs(mspatcha msvcrt kernel32 ntdll)
diff --git a/dll/win32/msports/CMakeLists.txt b/dll/win32/msports/CMakeLists.txt
index b0fee514b8..f924e4a439 100644
--- a/dll/win32/msports/CMakeLists.txt
+++ b/dll/win32/msports/CMakeLists.txt
@@ -10,7 +10,7 @@ list(APPEND SOURCE
precomp.h
${CMAKE_CURRENT_BINARY_DIR}/msports_stubs.c)
-add_library(msports SHARED
+add_library(msports MODULE
${SOURCE}
msports.rc
${CMAKE_CURRENT_BINARY_DIR}/msports.def)
diff --git a/dll/win32/msrle32/CMakeLists.txt b/dll/win32/msrle32/CMakeLists.txt
index 2efae9a17f..8db9998c3b 100644
--- a/dll/win32/msrle32/CMakeLists.txt
+++ b/dll/win32/msrle32/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
msrle32.c
${CMAKE_CURRENT_BINARY_DIR}/msrle32.def)
-add_library(msrle32 SHARED ${SOURCE} rsrc.rc)
+add_library(msrle32 MODULE ${SOURCE} rsrc.rc)
set_module_type(msrle32 win32dll)
target_link_libraries(msrle32 wine)
add_importlibs(msrle32 winmm user32 msvcrt kernel32 ntdll)
diff --git a/dll/win32/mssign32/CMakeLists.txt b/dll/win32/mssign32/CMakeLists.txt
index 0a4cac1a14..b60527f252 100644
--- a/dll/win32/mssign32/CMakeLists.txt
+++ b/dll/win32/mssign32/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/mssign32_stubs.c
${CMAKE_CURRENT_BINARY_DIR}/mssign32.def)
-add_library(mssign32 SHARED ${SOURCE})
+add_library(mssign32 MODULE ${SOURCE})
set_module_type(mssign32 win32dll)
target_link_libraries(mssign32 wine)
add_importlibs(mssign32 msvcrt kernel32 ntdll)
diff --git a/dll/win32/mssip32/CMakeLists.txt b/dll/win32/mssip32/CMakeLists.txt
index f4ee56f496..1dcdae40ba 100644
--- a/dll/win32/mssip32/CMakeLists.txt
+++ b/dll/win32/mssip32/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/mssip32_stubs.c
${CMAKE_CURRENT_BINARY_DIR}/mssip32.def)
-add_library(mssip32 SHARED ${SOURCE})
+add_library(mssip32 MODULE ${SOURCE})
set_module_type(mssip32 win32dll)
target_link_libraries(mssip32 wine)
add_importlibs(mssip32 msvcrt kernel32 ntdll)
diff --git a/dll/win32/mstask/CMakeLists.txt b/dll/win32/mstask/CMakeLists.txt
index de210746d5..5dec2c43a8 100644
--- a/dll/win32/mstask/CMakeLists.txt
+++ b/dll/win32/mstask/CMakeLists.txt
@@ -14,7 +14,7 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/mstask_local_i.c
${CMAKE_CURRENT_BINARY_DIR}/mstask_stubs.c)
-add_library(mstask SHARED
+add_library(mstask MODULE
${SOURCE}
rsrc.rc
${CMAKE_CURRENT_BINARY_DIR}/mstask.def)
diff --git a/dll/win32/msv1_0/CMakeLists.txt b/dll/win32/msv1_0/CMakeLists.txt
index e24124707d..6e2e41bb9d 100644
--- a/dll/win32/msv1_0/CMakeLists.txt
+++ b/dll/win32/msv1_0/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/msv1_0_stubs.c
${CMAKE_CURRENT_BINARY_DIR}/msv1_0.def)
-add_library(msv1_0 SHARED ${SOURCE})
+add_library(msv1_0 MODULE ${SOURCE})
set_module_type(msv1_0 win32dll UNICODE ENTRYPOINT 0)
target_link_libraries(msv1_0 wine ${PSEH_LIB})
add_delay_importlibs(msv1_0 samsrv lsasrv)
diff --git a/dll/win32/msvcrt/CMakeLists.txt b/dll/win32/msvcrt/CMakeLists.txt
index 0799e290be..2b558d1819 100644
--- a/dll/win32/msvcrt/CMakeLists.txt
+++ b/dll/win32/msvcrt/CMakeLists.txt
@@ -19,7 +19,7 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/msvcrt_stubs.c
${CMAKE_CURRENT_BINARY_DIR}/msvcrt.def)
-add_library(msvcrt SHARED ${SOURCE})
+add_library(msvcrt MODULE ${SOURCE})
set_module_type(msvcrt win32dll ENTRYPOINT DllMain 12)
add_dependencies(msvcrt psdk)
target_link_libraries(msvcrt crt wine ${PSEH_LIB})
diff --git a/dll/win32/msvcrt20/CMakeLists.txt b/dll/win32/msvcrt20/CMakeLists.txt
index 7ae2240ec1..64ff8379c8 100644
--- a/dll/win32/msvcrt20/CMakeLists.txt
+++ b/dll/win32/msvcrt20/CMakeLists.txt
@@ -18,7 +18,7 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/msvcrt20_stubs.c
${CMAKE_CURRENT_BINARY_DIR}/msvcrt20.def)
-add_library(msvcrt20 SHARED ${SOURCE})
+add_library(msvcrt20 MODULE ${SOURCE})
set_module_type(msvcrt20 win32dll ENTRYPOINT DllMain 12)
add_dependencies(msvcrt20 psdk)
target_link_libraries(msvcrt20 crt wine ${PSEH_LIB})
diff --git a/dll/win32/msvcrt40/CMakeLists.txt b/dll/win32/msvcrt40/CMakeLists.txt
index 5e2f89b223..e21c8d9f22 100644
--- a/dll/win32/msvcrt40/CMakeLists.txt
+++ b/dll/win32/msvcrt40/CMakeLists.txt
@@ -18,7 +18,7 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/msvcrt40_stubs.c
${CMAKE_CURRENT_BINARY_DIR}/msvcrt40.def)
-add_library(msvcrt40 SHARED ${SOURCE})
+add_library(msvcrt40 MODULE ${SOURCE})
set_module_type(msvcrt40 win32dll ENTRYPOINT DllMain 12)
add_dependencies(msvcrt40 psdk)
target_link_libraries(msvcrt40 crt wine ${PSEH_LIB})
diff --git a/dll/win32/msvfw32/CMakeLists.txt b/dll/win32/msvfw32/CMakeLists.txt
index 4bf2590bac..8c6309f80b 100644
--- a/dll/win32/msvfw32/CMakeLists.txt
+++ b/dll/win32/msvfw32/CMakeLists.txt
@@ -11,7 +11,7 @@ list(APPEND SOURCE
precomp.h
${CMAKE_CURRENT_BINARY_DIR}/msvfw32_stubs.c)
-add_library(msvfw32 SHARED
+add_library(msvfw32 MODULE
${SOURCE}
rsrc.rc
${CMAKE_CURRENT_BINARY_DIR}/msvfw32.def)
diff --git a/dll/win32/msvidc32/CMakeLists.txt b/dll/win32/msvidc32/CMakeLists.txt
index 947852af7e..ca5da72420 100644
--- a/dll/win32/msvidc32/CMakeLists.txt
+++ b/dll/win32/msvidc32/CMakeLists.txt
@@ -10,7 +10,7 @@ list(APPEND SOURCE
msvideo1.c
${CMAKE_CURRENT_BINARY_DIR}/msvidc32.def)
-add_library(msvidc32 SHARED ${SOURCE} rsrc.rc)
+add_library(msvidc32 MODULE ${SOURCE} rsrc.rc)
set_module_type(msvidc32 win32dll)
target_link_libraries(msvidc32 wine)
add_importlibs(msvidc32 user32 msvcrt kernel32 ntdll)
diff --git a/dll/win32/mswsock/CMakeLists.txt b/dll/win32/mswsock/CMakeLists.txt
index 8721463110..1950ca8192 100644
--- a/dll/win32/mswsock/CMakeLists.txt
+++ b/dll/win32/mswsock/CMakeLists.txt
@@ -10,7 +10,7 @@ list(APPEND SOURCE
stubs.c
precomp.h)
-add_library(mswsock SHARED
+add_library(mswsock MODULE
${SOURCE}
mswsock.rc
${CMAKE_CURRENT_BINARY_DIR}/mswsock.def)
diff --git a/dll/win32/msxml/CMakeLists.txt b/dll/win32/msxml/CMakeLists.txt
index c02242213d..44fc897ff8 100644
--- a/dll/win32/msxml/CMakeLists.txt
+++ b/dll/win32/msxml/CMakeLists.txt
@@ -14,7 +14,7 @@ list(APPEND SOURCE
main.c
${CMAKE_CURRENT_BINARY_DIR}/msxml.def)
-add_library(msxml SHARED ${SOURCE} rsrc.rc)
+add_library(msxml MODULE ${SOURCE} rsrc.rc)
set_module_type(msxml win32dll)
set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/msxml_tlb.tlb)
target_link_libraries(msxml wine)
diff --git a/dll/win32/msxml2/CMakeLists.txt b/dll/win32/msxml2/CMakeLists.txt
index fb7541fcdc..52deb1777d 100644
--- a/dll/win32/msxml2/CMakeLists.txt
+++ b/dll/win32/msxml2/CMakeLists.txt
@@ -14,7 +14,7 @@ list(APPEND SOURCE
main.c
${CMAKE_CURRENT_BINARY_DIR}/msxml2.def)
-add_library(msxml2 SHARED ${SOURCE} msxml2.rc)
+add_library(msxml2 MODULE ${SOURCE} msxml2.rc)
set_module_type(msxml2 win32dll)
set_source_files_properties(msxml2.rc PROPERTIES OBJECT_DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/msxml2_tlb.tlb)
target_link_libraries(msxml2 wine)
diff --git a/dll/win32/msxml3/CMakeLists.txt b/dll/win32/msxml3/CMakeLists.txt
index af6af6485a..7abb691b21 100644
--- a/dll/win32/msxml3/CMakeLists.txt
+++ b/dll/win32/msxml3/CMakeLists.txt
@@ -60,7 +60,7 @@ list(APPEND msxml3_rc_deps
set_source_files_properties(version.rc PROPERTIES OBJECT_DEPENDS
"${msxml3_rc_deps}")
-add_library(msxml3 SHARED
+add_library(msxml3 MODULE
${SOURCE}
factory.c
uuid.c
diff --git a/dll/win32/msxml4/CMakeLists.txt b/dll/win32/msxml4/CMakeLists.txt
index a7b404d232..ae8258358d 100644
--- a/dll/win32/msxml4/CMakeLists.txt
+++ b/dll/win32/msxml4/CMakeLists.txt
@@ -15,7 +15,7 @@ list(APPEND SOURCE
main.c
${CMAKE_CURRENT_BINARY_DIR}/msxml4.def)
-add_library(msxml4 SHARED ${SOURCE} rsrc.rc)
+add_library(msxml4 MODULE ${SOURCE} rsrc.rc)
set_module_type(msxml4 win32dll)
set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/msxml4_tlb.tlb)
target_link_libraries(msxml4 wine)
diff --git a/dll/win32/msxml6/CMakeLists.txt b/dll/win32/msxml6/CMakeLists.txt
index ae20fc6bd0..b0a95ec045 100644
--- a/dll/win32/msxml6/CMakeLists.txt
+++ b/dll/win32/msxml6/CMakeLists.txt
@@ -15,7 +15,7 @@ list(APPEND SOURCE
main.c
${CMAKE_CURRENT_BINARY_DIR}/msxml6.def)
-add_library(msxml6 SHARED ${SOURCE} rsrc.rc)
+add_library(msxml6 MODULE ${SOURCE} rsrc.rc)
set_module_type(msxml6 win32dll)
set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/msxml6_tlb.tlb)
target_link_libraries(msxml6 wine)
diff --git a/dll/win32/mycomput/CMakeLists.txt b/dll/win32/mycomput/CMakeLists.txt
index 2a828c73ad..add3ffa083 100644
--- a/dll/win32/mycomput/CMakeLists.txt
+++ b/dll/win32/mycomput/CMakeLists.txt
@@ -1,5 +1,5 @@
-add_library(mycomput SHARED
+add_library(mycomput MODULE
mycomput.rc)
set_module_type(mycomput win32dll UNICODE ENTRYPOINT 0)
diff --git a/dll/win32/nddeapi/CMakeLists.txt b/dll/win32/nddeapi/CMakeLists.txt
index 77525828f0..b3b6568c9b 100644
--- a/dll/win32/nddeapi/CMakeLists.txt
+++ b/dll/win32/nddeapi/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/nddeapi_stubs.c
${CMAKE_CURRENT_BINARY_DIR}/nddeapi.def)
-add_library(nddeapi SHARED ${SOURCE})
+add_library(nddeapi MODULE ${SOURCE})
set_module_type(nddeapi win32dll)
target_link_libraries(nddeapi wine)
add_importlibs(nddeapi msvcrt kernel32 ntdll)
diff --git a/dll/win32/netapi32/CMakeLists.txt b/dll/win32/netapi32/CMakeLists.txt
index dab40b16eb..046e372b6a 100644
--- a/dll/win32/netapi32/CMakeLists.txt
+++ b/dll/win32/netapi32/CMakeLists.txt
@@ -45,7 +45,7 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/srvsvc_c.c
${CMAKE_CURRENT_BINARY_DIR}/wkssvc_c.c)
-add_library(netapi32 SHARED
+add_library(netapi32 MODULE
${SOURCE}
${CMAKE_CURRENT_BINARY_DIR}/netapi32_stubs.c
${CMAKE_CURRENT_BINARY_DIR}/netapi32.def)
diff --git a/dll/win32/netcfgx/CMakeLists.txt b/dll/win32/netcfgx/CMakeLists.txt
index edbc3509b5..99313a57a4 100644
--- a/dll/win32/netcfgx/CMakeLists.txt
+++ b/dll/win32/netcfgx/CMakeLists.txt
@@ -15,7 +15,7 @@ list(APPEND SOURCE
precomp.h
${CMAKE_CURRENT_BINARY_DIR}/netcfgx_stubs.c)
-add_library(netcfgx SHARED
+add_library(netcfgx MODULE
${SOURCE}
netcfgx.rc
${CMAKE_CURRENT_BINARY_DIR}/netcfgx.def)
diff --git a/dll/win32/netevent/CMakeLists.txt b/dll/win32/netevent/CMakeLists.txt
index 20a6b8bc02..d21c01dd82 100644
--- a/dll/win32/netevent/CMakeLists.txt
+++ b/dll/win32/netevent/CMakeLists.txt
@@ -1,5 +1,5 @@
-add_library(netevent SHARED netevent.rc)
+add_library(netevent MODULE netevent.rc)
set_module_type(netevent module UNICODE)
add_dependencies(netevent neteventmsg)
add_cd_file(TARGET netevent DESTINATION reactos/system32 FOR all)
diff --git a/dll/win32/netid/CMakeLists.txt b/dll/win32/netid/CMakeLists.txt
index 0bdd5e9d66..1f3b87fc34 100644
--- a/dll/win32/netid/CMakeLists.txt
+++ b/dll/win32/netid/CMakeLists.txt
@@ -6,7 +6,7 @@ list(APPEND SOURCE
netid.rc
${CMAKE_CURRENT_BINARY_DIR}/netid.def)
-add_library(netid SHARED ${SOURCE})
+add_library(netid MODULE ${SOURCE})
set_module_type(netid win32dll UNICODE)
add_importlibs(netid user32 gdi32 comctl32 advapi32 netapi32 msvcrt kernel32 ntdll)
add_cd_file(TARGET netid DESTINATION reactos/system32 FOR all)
diff --git a/dll/win32/netmsg/CMakeLists.txt b/dll/win32/netmsg/CMakeLists.txt
index 7115171eba..50913fc444 100644
--- a/dll/win32/netmsg/CMakeLists.txt
+++ b/dll/win32/netmsg/CMakeLists.txt
@@ -1,5 +1,5 @@
-add_library(netmsg SHARED netmsg.rc)
+add_library(netmsg MODULE netmsg.rc)
set_module_type(netmsg module UNICODE ENTRYPOINT 0)
add_dependencies(netmsg netmsgmsg)
add_cd_file(TARGET netmsg DESTINATION reactos/system32 FOR all)
diff --git a/dll/win32/newdev/CMakeLists.txt b/dll/win32/newdev/CMakeLists.txt
index 7e8c13e940..1b4b76d0b6 100644
--- a/dll/win32/newdev/CMakeLists.txt
+++ b/dll/win32/newdev/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
newdev_private.h
${CMAKE_CURRENT_BINARY_DIR}/newdev_stubs.c)
-add_library(newdev SHARED
+add_library(newdev MODULE
${SOURCE}
newdev.rc
${CMAKE_CURRENT_BINARY_DIR}/newdev.def)
diff --git a/dll/win32/npptools/CMakeLists.txt b/dll/win32/npptools/CMakeLists.txt
index fbb0f5999c..122c121ef1 100644
--- a/dll/win32/npptools/CMakeLists.txt
+++ b/dll/win32/npptools/CMakeLists.txt
@@ -3,7 +3,7 @@ add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
spec2def(npptools.dll npptools.spec)
-add_library(npptools SHARED
+add_library(npptools MODULE
main.c
${CMAKE_CURRENT_BINARY_DIR}/npptools_stubs.c
${CMAKE_CURRENT_BINARY_DIR}/npptools.def)
diff --git a/dll/win32/ntdll_vista/CMakeLists.txt b/dll/win32/ntdll_vista/CMakeLists.txt
index 3a73db8df8..4ec1c0ab70 100644
--- a/dll/win32/ntdll_vista/CMakeLists.txt
+++ b/dll/win32/ntdll_vista/CMakeLists.txt
@@ -13,7 +13,7 @@ list(APPEND SOURCE
srw.c
${CMAKE_CURRENT_BINARY_DIR}/ntdll_vista.def)
-add_library(ntdll_vista SHARED ${SOURCE})
+add_library(ntdll_vista MODULE ${SOURCE})
set_module_type(ntdll_vista win32dll ENTRYPOINT DllMain 12)
add_importlibs(ntdll_vista ntdll)
add_dependencies(ntdll_vista psdk)
diff --git a/dll/win32/ntdsapi/CMakeLists.txt b/dll/win32/ntdsapi/CMakeLists.txt
index 4f2db85815..88a3f81655 100644
--- a/dll/win32/ntdsapi/CMakeLists.txt
+++ b/dll/win32/ntdsapi/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/ntdsapi_stubs.c
${CMAKE_CURRENT_BINARY_DIR}/ntdsapi.def)
-add_library(ntdsapi SHARED ${SOURCE})
+add_library(ntdsapi MODULE ${SOURCE})
set_module_type(ntdsapi win32dll)
target_link_libraries(ntdsapi wine)
add_importlibs(ntdsapi user32 msvcrt kernel32 ntdll)
diff --git a/dll/win32/ntlanman/CMakeLists.txt b/dll/win32/ntlanman/CMakeLists.txt
index 21773ad622..20c73ab0a0 100644
--- a/dll/win32/ntlanman/CMakeLists.txt
+++ b/dll/win32/ntlanman/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/ntlanman_stubs.c
${CMAKE_CURRENT_BINARY_DIR}/ntlanman.def)
-add_library(ntlanman SHARED ${SOURCE})
+add_library(ntlanman MODULE ${SOURCE})
set_module_type(ntlanman win32dll UNICODE)
target_link_libraries(ntlanman wine)
add_importlibs(ntlanman netapi32 msvcrt kernel32 ntdll)
diff --git a/dll/win32/ntmarta/CMakeLists.txt b/dll/win32/ntmarta/CMakeLists.txt
index 62553858c2..cecb8282bc 100644
--- a/dll/win32/ntmarta/CMakeLists.txt
+++ b/dll/win32/ntmarta/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
ntmarta.rc
${CMAKE_CURRENT_BINARY_DIR}/ntmarta.def)
-add_library(ntmarta SHARED ${SOURCE})
+add_library(ntmarta MODULE ${SOURCE})
set_module_type(ntmarta win32dll UNICODE)
add_importlibs(ntmarta user32 advapi32 msvcrt kernel32 ntdll)
add_cd_file(TARGET ntmarta DESTINATION reactos/system32 FOR all)
diff --git a/dll/win32/objsel/CMakeLists.txt b/dll/win32/objsel/CMakeLists.txt
index c32bda6d5f..4187d1d9b0 100644
--- a/dll/win32/objsel/CMakeLists.txt
+++ b/dll/win32/objsel/CMakeLists.txt
@@ -11,7 +11,7 @@ list(APPEND SOURCE
objsel.c
precomp.h)
-add_library(objsel SHARED
+add_library(objsel MODULE
${SOURCE}
objsel.rc
${CMAKE_CURRENT_BINARY_DIR}/objsel.def)
diff --git a/dll/win32/odbc32/CMakeLists.txt b/dll/win32/odbc32/CMakeLists.txt
index 109606c113..2fd48cc3c8 100644
--- a/dll/win32/odbc32/CMakeLists.txt
+++ b/dll/win32/odbc32/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/odbc32_stubs.c
${CMAKE_CURRENT_BINARY_DIR}/odbc32.def)
-add_library(odbc32 SHARED ${SOURCE})
+add_library(odbc32 MODULE ${SOURCE})
set_module_type(odbc32 win32dll)
target_link_libraries(odbc32 wine)
add_importlibs(odbc32 advapi32 msvcrt kernel32 ntdll)
diff --git a/dll/win32/odbccp32/CMakeLists.txt b/dll/win32/odbccp32/CMakeLists.txt
index b2f61e6e22..77949d4d16 100644
--- a/dll/win32/odbccp32/CMakeLists.txt
+++ b/dll/win32/odbccp32/CMakeLists.txt
@@ -11,7 +11,7 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/odbccp32_stubs.c
${CMAKE_CURRENT_BINARY_DIR}/odbccp32.def)
-add_library(odbccp32 SHARED ${SOURCE})
+add_library(odbccp32 MODULE ${SOURCE})
set_module_type(odbccp32 win32dll)
target_link_libraries(odbccp32 uuid wine)
add_importlibs(odbccp32 advapi32 msvcrt kernel32 ntdll)
diff --git a/dll/win32/ole32/CMakeLists.txt b/dll/win32/ole32/CMakeLists.txt
index 327812243b..c0b2f2007a 100644
--- a/dll/win32/ole32/CMakeLists.txt
+++ b/dll/win32/ole32/CMakeLists.txt
@@ -66,7 +66,7 @@ if(MSVC AND (ARCH STREQUAL "i386"))
list(APPEND SOURCE msvc-thiscall.c)
endif()
-add_library(ole32 SHARED
+add_library(ole32 MODULE
${SOURCE}
guid.c
ole32res.rc
diff --git a/dll/win32/oleacc/CMakeLists.txt b/dll/win32/oleacc/CMakeLists.txt
index 9f28fffd6c..bea28fa047 100644
--- a/dll/win32/oleacc/CMakeLists.txt
+++ b/dll/win32/oleacc/CMakeLists.txt
@@ -27,7 +27,7 @@ list(APPEND oleacc_rc_deps
set_source_files_properties(oleacc.rc PROPERTIES OBJECT_DEPENDS
"${oleacc_rc_deps}")
-add_library(oleacc SHARED
+add_library(oleacc MODULE
${SOURCE}
guid.c
oleacc.rc
diff --git a/dll/win32/oleaut32/CMakeLists.txt b/dll/win32/oleaut32/CMakeLists.txt
index 1eae81ee81..30a18b9baa 100644
--- a/dll/win32/oleaut32/CMakeLists.txt
+++ b/dll/win32/oleaut32/CMakeLists.txt
@@ -36,7 +36,7 @@ if(MSVC)
add_asm_files(oleaut32_asm msvc.S)
endif()
-add_library(oleaut32 SHARED
+add_library(oleaut32 MODULE
${SOURCE}
${oleaut32_asm}
oleaut32.rc
diff --git a/dll/win32/olecli32/CMakeLists.txt b/dll/win32/olecli32/CMakeLists.txt
index ac5d2bfb0f..5ade3f7433 100644
--- a/dll/win32/olecli32/CMakeLists.txt
+++ b/dll/win32/olecli32/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/olecli32_stubs.c
${CMAKE_CURRENT_BINARY_DIR}/olecli32.def)
-add_library(olecli32 SHARED ${SOURCE})
+add_library(olecli32 MODULE ${SOURCE})
set_module_type(olecli32 win32dll)
target_link_libraries(olecli32 wine)
add_importlibs(olecli32 ole32 gdi32 msvcrt kernel32 ntdll)
diff --git a/dll/win32/oledlg/CMakeLists.txt b/dll/win32/oledlg/CMakeLists.txt
index 4d568d37e3..f1abe4e3e1 100644
--- a/dll/win32/oledlg/CMakeLists.txt
+++ b/dll/win32/oledlg/CMakeLists.txt
@@ -9,7 +9,7 @@ list(APPEND SOURCE
pastespl.c
precomp.h)
-add_library(oledlg SHARED
+add_library(oledlg MODULE
${SOURCE}
rsrc.rc
${CMAKE_CURRENT_BINARY_DIR}/oledlg.def)
diff --git a/dll/win32/olepro32/CMakeLists.txt b/dll/win32/olepro32/CMakeLists.txt
index c4a172e0b3..0513497edd 100644
--- a/dll/win32/olepro32/CMakeLists.txt
+++ b/dll/win32/olepro32/CMakeLists.txt
@@ -14,7 +14,7 @@ list(APPEND olepro32_rc_deps
set_source_files_properties(version.rc PROPERTIES OBJECT_DEPENDS
"${olepro32_rc_deps}")
-add_library(olepro32 SHARED ${SOURCE} version.rc)
+add_library(olepro32 MODULE ${SOURCE} version.rc)
add_dependencies(olepro32 stdole2)
set_module_type(olepro32 win32dll)
target_link_libraries(olepro32 wine)
diff --git a/dll/win32/olesvr32/CMakeLists.txt b/dll/win32/olesvr32/CMakeLists.txt
index ebe0bca5b2..13188640f2 100644
--- a/dll/win32/olesvr32/CMakeLists.txt
+++ b/dll/win32/olesvr32/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/olesvr32_stubs.c
${CMAKE_CURRENT_BINARY_DIR}/olesvr32.def)
-add_library(olesvr32 SHARED ${SOURCE})
+add_library(olesvr32 MODULE ${SOURCE})
set_module_type(olesvr32 win32dll)
target_link_libraries(olesvr32 wine)
add_importlibs(olesvr32 msvcrt kernel32 ntdll)
diff --git a/dll/win32/olethk32/CMakeLists.txt b/dll/win32/olethk32/CMakeLists.txt
index c687bcb509..aa5bb2da22 100644
--- a/dll/win32/olethk32/CMakeLists.txt
+++ b/dll/win32/olethk32/CMakeLists.txt
@@ -9,7 +9,7 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/olethk32_stubs.c
${CMAKE_CURRENT_BINARY_DIR}/olethk32.def)
-add_library(olethk32 SHARED ${SOURCE})
+add_library(olethk32 MODULE ${SOURCE})
set_module_type(olethk32 win32dll)
target_link_libraries(olethk32 wine)
add_importlibs(olethk32 msvcrt kernel32 ntdll)
diff --git a/dll/win32/pdh/CMakeLists.txt b/dll/win32/pdh/CMakeLists.txt
index ca8c9433f5..dc735a7367 100644
--- a/dll/win32/pdh/CMakeLists.txt
+++ b/dll/win32/pdh/CMakeLists.txt
@@ -11,7 +11,7 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/pdh_stubs.c
${CMAKE_CURRENT_BINARY_DIR}/pdh.def)
-add_library(pdh SHARED ${SOURCE})
+add_library(pdh MODULE ${SOURCE})
set_module_type(pdh win32dll)
target_link_libraries(pdh wine)
add_importlibs(pdh msvcrt kernel32_vista kernel32 ntdll)
diff --git a/dll/win32/pidgen/CMakeLists.txt b/dll/win32/pidgen/CMakeLists.txt
index 8b5be1943c..f15cb982b8 100644
--- a/dll/win32/pidgen/CMakeLists.txt
+++ b/dll/win32/pidgen/CMakeLists.txt
@@ -9,7 +9,7 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/pidgen_stubs.c
${CMAKE_CURRENT_BINARY_DIR}/pidgen.def)
-add_library(pidgen SHARED ${SOURCE})
+add_library(pidgen MODULE ${SOURCE})
set_module_type(pidgen win32dll)
target_link_libraries(pidgen wine)
add_importlibs(pidgen msvcrt kernel32 ntdll)
diff --git a/dll/win32/powrprof/CMakeLists.txt b/dll/win32/powrprof/CMakeLists.txt
index 44146f91a3..cf6a2199a9 100644
--- a/dll/win32/powrprof/CMakeLists.txt
+++ b/dll/win32/powrprof/CMakeLists.txt
@@ -1,7 +1,7 @@
spec2def(powrprof.dll powrprof.spec ADD_IMPORTLIB)
-add_library(powrprof SHARED
+add_library(powrprof MODULE
powrprof.c
powrprof.rc
${CMAKE_CURRENT_BINARY_DIR}/powrprof.def)
diff --git a/dll/win32/printui/CMakeLists.txt b/dll/win32/printui/CMakeLists.txt
index 076fbfa82d..ebf9752e55 100644
--- a/dll/win32/printui/CMakeLists.txt
+++ b/dll/win32/printui/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/printui_stubs.c
${CMAKE_CURRENT_BINARY_DIR}/printui.def)
-add_library(printui SHARED ${SOURCE} printui.rc)
+add_library(printui MODULE ${SOURCE} printui.rc)
set_module_type(printui win32dll)
target_link_libraries(printui wine)
add_importlibs(printui shell32 msvcrt kernel32 ntdll)
diff --git a/dll/win32/propsys/CMakeLists.txt b/dll/win32/propsys/CMakeLists.txt
index 7b61789aa2..8d788ae20d 100644
--- a/dll/win32/propsys/CMakeLists.txt
+++ b/dll/win32/propsys/CMakeLists.txt
@@ -10,7 +10,7 @@ list(APPEND SOURCE
precomp.h
${CMAKE_CURRENT_BINARY_DIR}/propsys_stubs.c)
-add_library(propsys SHARED
+add_library(propsys MODULE
${SOURCE}
propsys.rc
${CMAKE_CURRENT_BINARY_DIR}/propsys.def)
diff --git a/dll/win32/psapi/CMakeLists.txt b/dll/win32/psapi/CMakeLists.txt
index a58d7324d5..d92b5d415f 100644
--- a/dll/win32/psapi/CMakeLists.txt
+++ b/dll/win32/psapi/CMakeLists.txt
@@ -6,7 +6,7 @@ list(APPEND SOURCE
psapi.rc
${CMAKE_CURRENT_BINARY_DIR}/psapi.def)
-add_library(psapi SHARED ${SOURCE})
+add_library(psapi MODULE ${SOURCE})
set_module_type(psapi win32dll)
target_link_libraries(psapi ${PSEH_LIB})
add_importlibs(psapi msvcrt kernel32 ntdll)
diff --git a/dll/win32/pstorec/CMakeLists.txt b/dll/win32/pstorec/CMakeLists.txt
index e75e4e8f2e..1f168e3fbf 100644
--- a/dll/win32/pstorec/CMakeLists.txt
+++ b/dll/win32/pstorec/CMakeLists.txt
@@ -9,7 +9,7 @@ list(APPEND SOURCE
add_typelib(pstorec_tlb.idl)
set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/pstorec_tlb.tlb)
-add_library(pstorec SHARED ${SOURCE} rsrc.rc)
+add_library(pstorec MODULE ${SOURCE} rsrc.rc)
set_module_type(pstorec win32dll)
target_link_libraries(pstorec uuid wine)
add_importlibs(pstorec msvcrt kernel32 ntdll)
diff --git a/dll/win32/qmgr/CMakeLists.txt b/dll/win32/qmgr/CMakeLists.txt
index 21fec58fe3..eea7ab2bf3 100644
--- a/dll/win32/qmgr/CMakeLists.txt
+++ b/dll/win32/qmgr/CMakeLists.txt
@@ -16,7 +16,7 @@ list(APPEND SOURCE
precomp.h
${CMAKE_CURRENT_BINARY_DIR}/qmgr_local_i.c)
-add_library(qmgr SHARED
+add_library(qmgr MODULE
${SOURCE}
rsrc.rc
${CMAKE_CURRENT_BINARY_DIR}/qmgr.def)
diff --git a/dll/win32/qmgrprxy/CMakeLists.txt b/dll/win32/qmgrprxy/CMakeLists.txt
index 1ec90cdbb7..a207e3eff3 100644
--- a/dll/win32/qmgrprxy/CMakeLists.txt
+++ b/dll/win32/qmgrprxy/CMakeLists.txt
@@ -15,7 +15,7 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c
${CMAKE_CURRENT_BINARY_DIR}/qmgrprxy.def)
-add_library(qmgrprxy SHARED ${SOURCE})
+add_library(qmgrprxy MODULE ${SOURCE})
set_module_type(qmgrprxy win32dll)
target_link_libraries(qmgrprxy ${PSEH_LIB} wine)
add_importlibs(qmgrprxy rpcrt4 msvcrt kernel32 ntdll)
diff --git a/dll/win32/query/CMakeLists.txt b/dll/win32/query/CMakeLists.txt
index cc527e413d..dcceb5106a 100644
--- a/dll/win32/query/CMakeLists.txt
+++ b/dll/win32/query/CMakeLists.txt
@@ -11,7 +11,7 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/query_stubs.c
${CMAKE_CURRENT_BINARY_DIR}/query.def)
-add_library(query SHARED ${SOURCE})
+add_library(query MODULE ${SOURCE})
set_module_type(query win32dll)
target_link_libraries(query wine)
add_importlibs(query msvcrt kernel32 ntdll)
diff --git a/dll/win32/rasadhlp/CMakeLists.txt b/dll/win32/rasadhlp/CMakeLists.txt
index 891525a0ec..9ab054df3e 100644
--- a/dll/win32/rasadhlp/CMakeLists.txt
+++ b/dll/win32/rasadhlp/CMakeLists.txt
@@ -9,7 +9,7 @@ list(APPEND SOURCE
precomp.h
${CMAKE_CURRENT_BINARY_DIR}/rasadhlp_stubs.c)
-add_library(rasadhlp SHARED
+add_library(rasadhlp MODULE
${SOURCE}
${CMAKE_CURRENT_BINARY_DIR}/rasadhlp.def)
diff --git a/dll/win32/rasapi32/CMakeLists.txt b/dll/win32/rasapi32/CMakeLists.txt
index b5eba57f37..41c7cca761 100644
--- a/dll/win32/rasapi32/CMakeLists.txt
+++ b/dll/win32/rasapi32/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/rasapi32_stubs.c
${CMAKE_CURRENT_BINARY_DIR}/rasapi32.def)
-add_library(rasapi32 SHARED ${SOURCE})
+add_library(rasapi32 MODULE ${SOURCE})
set_module_type(rasapi32 win32dll)
target_link_libraries(rasapi32 wine)
add_importlibs(rasapi32 msvcrt kernel32 ntdll)
diff --git a/dll/win32/rasdlg/CMakeLists.txt b/dll/win32/rasdlg/CMakeLists.txt
index 3b0cb2a4a5..3f2e84d499 100644
--- a/dll/win32/rasdlg/CMakeLists.txt
+++ b/dll/win32/rasdlg/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/rasdlg_stubs.c
${CMAKE_CURRENT_BINARY_DIR}/rasdlg.def)
-add_library(rasdlg SHARED ${SOURCE})
+add_library(rasdlg MODULE ${SOURCE})
set_module_type(rasdlg win32dll)
target_link_libraries(rasdlg wine uuid)
add_importlibs(rasdlg msvcrt kernel32 ntdll)
diff --git a/dll/win32/rasman/CMakeLists.txt b/dll/win32/rasman/CMakeLists.txt
index ef32f9b54d..5ba8619d41 100644
--- a/dll/win32/rasman/CMakeLists.txt
+++ b/dll/win32/rasman/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/rasman_stubs.c
${CMAKE_CURRENT_BINARY_DIR}/rasman.def)
-add_library(rasman SHARED ${SOURCE})
+add_library(rasman MODULE ${SOURCE})
set_module_type(rasman win32dll)
target_link_libraries(rasman wine uuid)
add_importlibs(rasman msvcrt kernel32 ntdll)
diff --git a/dll/win32/resutils/CMakeLists.txt b/dll/win32/resutils/CMakeLists.txt
index 0bdf8f665a..111ab7e183 100644
--- a/dll/win32/resutils/CMakeLists.txt
+++ b/dll/win32/resutils/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/resutils_stubs.c
${CMAKE_CURRENT_BINARY_DIR}/resutils.def)
-add_library(resutils SHARED ${SOURCE})
+add_library(resutils MODULE ${SOURCE})
set_module_type(resutils win32dll)
target_link_libraries(resutils wine)
add_importlibs(resutils msvcrt kernel32 ntdll)
diff --git a/dll/win32/riched20/CMakeLists.txt b/dll/win32/riched20/CMakeLists.txt
index d7ed37de70..11e185983e 100644
--- a/dll/win32/riched20/CMakeLists.txt
+++ b/dll/win32/riched20/CMakeLists.txt
@@ -30,7 +30,7 @@ list(APPEND riched20_rc_deps
${CMAKE_CURRENT_BINARY_DIR}/riched_tom.tlb)
set_source_files_properties(version.rc PROPERTIES OBJECT_DEPENDS
"${riched20_rc_deps}")
-add_library(riched20 SHARED
+add_library(riched20 MODULE
${SOURCE}
version.rc
${CMAKE_CURRENT_BINARY_DIR}/riched20.def)
diff --git a/dll/win32/riched32/CMakeLists.txt b/dll/win32/riched32/CMakeLists.txt
index 8db9e18882..f719d7a261 100644
--- a/dll/win32/riched32/CMakeLists.txt
+++ b/dll/win32/riched32/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
richedit.c
${CMAKE_CURRENT_BINARY_DIR}/riched32.def)
-add_library(riched32 SHARED ${SOURCE} version.rc)
+add_library(riched32 MODULE ${SOURCE} version.rc)
set_module_type(riched32 win32dll)
target_link_libraries(riched32 wine)
add_importlibs(riched32 riched20 user32 msvcrt kernel32 ntdll)
diff --git a/dll/win32/rpcrt4/CMakeLists.txt b/dll/win32/rpcrt4/CMakeLists.txt
index 24c5d8fb40..a3d68266de 100644
--- a/dll/win32/rpcrt4/CMakeLists.txt
+++ b/dll/win32/rpcrt4/CMakeLists.txt
@@ -46,7 +46,7 @@ if(MSVC AND NOT ARCH STREQUAL "arm")
add_asm_files(rpcrt4_asm msvc.S)
endif()
-add_library(rpcrt4 SHARED
+add_library(rpcrt4 MODULE
${SOURCE}
ndr_typelib.c
${CMAKE_CURRENT_BINARY_DIR}/ndr_types_p.c
diff --git a/dll/win32/rsabase/CMakeLists.txt b/dll/win32/rsabase/CMakeLists.txt
index 38d9335eb8..4b4cd83743 100644
--- a/dll/win32/rsabase/CMakeLists.txt
+++ b/dll/win32/rsabase/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
version.rc
${CMAKE_CURRENT_BINARY_DIR}/rsabase.def)
-add_library(rsabase SHARED ${SOURCE})
+add_library(rsabase MODULE ${SOURCE})
set_module_type(rsabase win32dll ENTRYPOINT 0 )
target_link_libraries(rsabase wine)
add_importlibs(rsabase rsaenh ntdll)
diff --git a/dll/win32/rsaenh/CMakeLists.txt b/dll/win32/rsaenh/CMakeLists.txt
index 6248ed3e57..700ccb81f9 100644
--- a/dll/win32/rsaenh/CMakeLists.txt
+++ b/dll/win32/rsaenh/CMakeLists.txt
@@ -17,7 +17,7 @@ list(APPEND SOURCE
sha2.c
tomcrypt.h)
-add_library(rsaenh SHARED
+add_library(rsaenh MODULE
${SOURCE}
rsrc.rc
${CMAKE_CURRENT_BINARY_DIR}/rsaenh.def)
diff --git a/dll/win32/samlib/CMakeLists.txt b/dll/win32/samlib/CMakeLists.txt
index 8c23aed7a6..7cf73e2538 100644
--- a/dll/win32/samlib/CMakeLists.txt
+++ b/dll/win32/samlib/CMakeLists.txt
@@ -14,7 +14,7 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/sam_c.c
${CMAKE_CURRENT_BINARY_DIR}/samlib_stubs.c)
-add_library(samlib SHARED
+add_library(samlib MODULE
${SOURCE}
samlib.rc
${CMAKE_CURRENT_BINARY_DIR}/samlib.def)
diff --git a/dll/win32/samsrv/CMakeLists.txt b/dll/win32/samsrv/CMakeLists.txt
index 3e367abb87..f3303d61ee 100644
--- a/dll/win32/samsrv/CMakeLists.txt
+++ b/dll/win32/samsrv/CMakeLists.txt
@@ -22,7 +22,7 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/sam_s.c
${CMAKE_CURRENT_BINARY_DIR}/samsrv_stubs.c)
-add_library(samsrv SHARED
+add_library(samsrv MODULE
${SOURCE}
samsrv.rc
${CMAKE_CURRENT_BINARY_DIR}/samsrv.def)
diff --git a/dll/win32/sccbase/CMakeLists.txt b/dll/win32/sccbase/CMakeLists.txt
index 5733cae59a..c4c81abc6c 100644
--- a/dll/win32/sccbase/CMakeLists.txt
+++ b/dll/win32/sccbase/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/sccbase_stubs.c
${CMAKE_CURRENT_BINARY_DIR}/sccbase.def)
-add_library(sccbase SHARED ${SOURCE})
+add_library(sccbase MODULE ${SOURCE})
set_module_type(sccbase win32dll)
target_link_libraries(sccbase wine)
add_importlibs(sccbase msvcrt kernel32 ntdll)
diff --git a/dll/win32/schannel/CMakeLists.txt b/dll/win32/schannel/CMakeLists.txt
index 205535005b..4a0cf0cc53 100644
--- a/dll/win32/schannel/CMakeLists.txt
+++ b/dll/win32/schannel/CMakeLists.txt
@@ -18,7 +18,7 @@ list(APPEND SOURCE
precomp.h
${CMAKE_CURRENT_BINARY_DIR}/schannel_stubs.c)
-add_library(schannel SHARED
+add_library(schannel MODULE
${SOURCE}
version.rc
${CMAKE_CURRENT_BINARY_DIR}/schannel.def)
diff --git a/dll/win32/scrrun/CMakeLists.txt b/dll/win32/scrrun/CMakeLists.txt
index d77282faf2..791cb93bb6 100644
--- a/dll/win32/scrrun/CMakeLists.txt
+++ b/dll/win32/scrrun/CMakeLists.txt
@@ -19,7 +19,7 @@ list(APPEND scrrun_rc_deps
set_source_files_properties(scrrun.rc PROPERTIES OBJECT_DEPENDS
"${scrrun_rc_deps}")
-add_library(scrrun SHARED
+add_library(scrrun MODULE
${SOURCE}
guid.c
scrrun.rc
diff --git a/dll/win32/secur32/CMakeLists.txt b/dll/win32/secur32/CMakeLists.txt
index f1b696d584..d8e06d9ef1 100644
--- a/dll/win32/secur32/CMakeLists.txt
+++ b/dll/win32/secur32/CMakeLists.txt
@@ -19,7 +19,7 @@ list(APPEND SOURCE
wine/util.c
precomp.h)
-add_library(secur32 SHARED
+add_library(secur32 MODULE
${SOURCE}
secur32.rc
${CMAKE_CURRENT_BINARY_DIR}/secur32_stubs.c
diff --git a/dll/win32/security/CMakeLists.txt b/dll/win32/security/CMakeLists.txt
index 12a85b169e..faf84a39a1 100644
--- a/dll/win32/security/CMakeLists.txt
+++ b/dll/win32/security/CMakeLists.txt
@@ -6,7 +6,7 @@ list(APPEND SOURCE
security.rc
${CMAKE_CURRENT_BINARY_DIR}/security.def)
-add_library(security SHARED ${SOURCE})
+add_library(security MODULE ${SOURCE})
set_module_type(security win32dll ENTRYPOINT 0 UNICODE)
add_importlibs(security secur32)
add_cd_file(TARGET security DESTINATION reactos/system32 FOR all)
diff --git a/dll/win32/sensapi/CMakeLists.txt b/dll/win32/sensapi/CMakeLists.txt
index 463a461c01..fac2b2cd59 100644
--- a/dll/win32/sensapi/CMakeLists.txt
+++ b/dll/win32/sensapi/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
sensapi.c
${CMAKE_CURRENT_BINARY_DIR}/sensapi.def)
-add_library(sensapi SHARED ${SOURCE})
+add_library(sensapi MODULE ${SOURCE})
set_module_type(sensapi win32dll)
target_link_libraries(sensapi wine)
add_importlibs(sensapi msvcrt kernel32 ntdll)
diff --git a/dll/win32/serialui/CMakeLists.txt b/dll/win32/serialui/CMakeLists.txt
index 728ff9a6bd..c9a02f22ca 100644
--- a/dll/win32/serialui/CMakeLists.txt
+++ b/dll/win32/serialui/CMakeLists.txt
@@ -6,7 +6,7 @@ list(APPEND SOURCE
serialui.rc
${CMAKE_CURRENT_BINARY_DIR}/serialui.def)
-add_library(serialui SHARED ${SOURCE})
+add_library(serialui MODULE ${SOURCE})
set_module_type(serialui win32dll UNICODE)
add_importlibs(serialui user32 shlwapi msvcrt kernel32)
add_cd_file(TARGET serialui DESTINATION reactos/system32 FOR all)
diff --git a/dll/win32/setupapi/CMakeLists.txt b/dll/win32/setupapi/CMakeLists.txt
index 933d66111a..964614012b 100644
--- a/dll/win32/setupapi/CMakeLists.txt
+++ b/dll/win32/setupapi/CMakeLists.txt
@@ -33,7 +33,7 @@ list(APPEND SOURCE
setupapi_private.h
${CMAKE_CURRENT_BINARY_DIR}/pnp_c.c)
-add_library(setupapi SHARED
+add_library(setupapi MODULE
${SOURCE}
setupapi.rc
${CMAKE_CURRENT_BINARY_DIR}/setupapi_stubs.c
diff --git a/dll/win32/sfc/CMakeLists.txt b/dll/win32/sfc/CMakeLists.txt
index 350c8d8a54..33fa498945 100644
--- a/dll/win32/sfc/CMakeLists.txt
+++ b/dll/win32/sfc/CMakeLists.txt
@@ -6,7 +6,7 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/sfc_stubs.c
${CMAKE_CURRENT_BINARY_DIR}/sfc.def)
-add_library(sfc SHARED ${SOURCE})
+add_library(sfc MODULE ${SOURCE})
set_module_type(sfc win32dll)
add_importlibs(sfc sfc_os msvcrt kernel32 ntdll)
add_cd_file(TARGET sfc DESTINATION reactos/system32 FOR all)
diff --git a/dll/win32/sfc_os/CMakeLists.txt b/dll/win32/sfc_os/CMakeLists.txt
index d9713f9dec..4d722e916c 100644
--- a/dll/win32/sfc_os/CMakeLists.txt
+++ b/dll/win32/sfc_os/CMakeLists.txt
@@ -6,7 +6,7 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/sfc_os_stubs.c
${CMAKE_CURRENT_BINARY_DIR}/sfc_os.def)
-add_library(sfc_os SHARED ${SOURCE})
+add_library(sfc_os MODULE ${SOURCE})
set_module_type(sfc_os win32dll)
add_importlibs(sfc_os msvcrt kernel32 ntdll)
add_cd_file(TARGET sfc_os DESTINATION reactos/system32 FOR all)
diff --git a/dll/win32/shdoclc/CMakeLists.txt b/dll/win32/shdoclc/CMakeLists.txt
index ebc0823bcd..2e5415585a 100644
--- a/dll/win32/shdoclc/CMakeLists.txt
+++ b/dll/win32/shdoclc/CMakeLists.txt
@@ -2,7 +2,7 @@
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
spec2def(shdoclc.dll shdoclc.spec)
-add_library(shdoclc SHARED
+add_library(shdoclc MODULE
rsrc.rc
${CMAKE_CURRENT_BINARY_DIR}/shdoclc.def)
diff --git a/dll/win32/shdocvw/CMakeLists.txt b/dll/win32/shdocvw/CMakeLists.txt
index 5efd1fda99..ecc274f294 100644
--- a/dll/win32/shdocvw/CMakeLists.txt
+++ b/dll/win32/shdocvw/CMakeLists.txt
@@ -15,7 +15,7 @@ list(APPEND SOURCE
add_typelib(shdocvw_v1.idl)
set_source_files_properties(shdocvw.rc PROPERTIES OBJECT_DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/shdocvw_v1.tlb)
-add_library(shdocvw SHARED
+add_library(shdocvw MODULE
${SOURCE}
shdocvw.rc
${CMAKE_CURRENT_BINARY_DIR}/shdocvw.def)
diff --git a/dll/win32/shell32/CMakeLists.txt b/dll/win32/shell32/CMakeLists.txt
index 78ee1af531..871e924703 100644
--- a/dll/win32/shell32/CMakeLists.txt
+++ b/dll/win32/shell32/CMakeLists.txt
@@ -86,7 +86,7 @@ file(GLOB_RECURSE shell32_rc_deps res/*.*)
list(APPEND shell32_rc_deps ${CMAKE_CURRENT_BINARY_DIR}/shell32_shldisp.tlb)
add_rc_deps(shell32.rc ${shell32_rc_deps})
-add_library(shell32 SHARED
+add_library(shell32 MODULE
${SOURCE}
wine/brsfolder.c
wine/changenotify.c
diff --git a/dll/win32/shfolder/CMakeLists.txt b/dll/win32/shfolder/CMakeLists.txt
index 6beb269776..34f08350df 100644
--- a/dll/win32/shfolder/CMakeLists.txt
+++ b/dll/win32/shfolder/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
version.rc
${CMAKE_CURRENT_BINARY_DIR}/shfolder.def)
-add_library(shfolder SHARED ${SOURCE})
+add_library(shfolder MODULE ${SOURCE})
set_module_type(shfolder win32dll ENTRYPOINT 0 )
target_link_libraries(shfolder wine)
add_importlibs(shfolder shell32 kernel32 ntdll)
diff --git a/dll/win32/shimgvw/CMakeLists.txt b/dll/win32/shimgvw/CMakeLists.txt
index 8895a0b654..e26d54f73b 100644
--- a/dll/win32/shimgvw/CMakeLists.txt
+++ b/dll/win32/shimgvw/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/shimgvw_stubs.c
${CMAKE_CURRENT_BINARY_DIR}/shimgvw.def)
-add_library(shimgvw SHARED ${SOURCE})
+add_library(shimgvw MODULE ${SOURCE})
set_module_type(shimgvw win32dll)
target_link_libraries(shimgvw wine)
add_importlibs(shimgvw advapi32 comctl32 user32 gdi32 gdiplus comdlg32 shlwapi msvcrt
kernel32 ntdll)
diff --git a/dll/win32/shlwapi/CMakeLists.txt b/dll/win32/shlwapi/CMakeLists.txt
index ec0e2e65e6..78fe1d19bf 100644
--- a/dll/win32/shlwapi/CMakeLists.txt
+++ b/dll/win32/shlwapi/CMakeLists.txt
@@ -28,7 +28,7 @@ list(APPEND SOURCE
url.c
precomp.h)
-add_library(shlwapi SHARED
+add_library(shlwapi MODULE
${SOURCE}
shlwapi.rc
wsprintf.c
diff --git a/dll/win32/slbcsp/CMakeLists.txt b/dll/win32/slbcsp/CMakeLists.txt
index f697aef964..b05ac017d9 100644
--- a/dll/win32/slbcsp/CMakeLists.txt
+++ b/dll/win32/slbcsp/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/slbcsp_stubs.c
${CMAKE_CURRENT_BINARY_DIR}/slbcsp.def)
-add_library(slbcsp SHARED ${SOURCE})
+add_library(slbcsp MODULE ${SOURCE})
set_module_type(slbcsp win32dll)
target_link_libraries(slbcsp wine)
add_importlibs(slbcsp msvcrt kernel32 ntdll)
diff --git a/dll/win32/smdll/CMakeLists.txt b/dll/win32/smdll/CMakeLists.txt
index 4c5d88cb48..9c38ba32b2 100644
--- a/dll/win32/smdll/CMakeLists.txt
+++ b/dll/win32/smdll/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
query.c
precomp.h)
-add_library(smdll SHARED
+add_library(smdll MODULE
${SOURCE}
smdll.rc
${CMAKE_CURRENT_BINARY_DIR}/smdll.def)
diff --git a/dll/win32/sndblst/CMakeLists.txt b/dll/win32/sndblst/CMakeLists.txt
index 43935837dc..47a5880355 100644
--- a/dll/win32/sndblst/CMakeLists.txt
+++ b/dll/win32/sndblst/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
sndblst.c
${CMAKE_CURRENT_BINARY_DIR}/sndblst.def)
-add_library(sndblst SHARED ${SOURCE})
+add_library(sndblst MODULE ${SOURCE})
set_module_type(sndblst win32dll UNICODE)
target_link_libraries(sndblst mment4 mmebuddy)
add_importlibs(sndblst user32 winmm advapi32 msvcrt kernel32 ntdll)
diff --git a/dll/win32/snmpapi/CMakeLists.txt b/dll/win32/snmpapi/CMakeLists.txt
index 76c9994bd9..32b10f7f93 100644
--- a/dll/win32/snmpapi/CMakeLists.txt
+++ b/dll/win32/snmpapi/CMakeLists.txt
@@ -11,7 +11,7 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/snmpapi_stubs.c
${CMAKE_CURRENT_BINARY_DIR}/snmpapi.def)
-add_library(snmpapi SHARED ${SOURCE} snmpapi.rc)
+add_library(snmpapi MODULE ${SOURCE} snmpapi.rc)
set_module_type(snmpapi win32dll)
target_link_libraries(snmpapi wine)
add_importlibs(snmpapi msvcrt kernel32_vista kernel32 ntdll)
diff --git a/dll/win32/softpub/CMakeLists.txt b/dll/win32/softpub/CMakeLists.txt
index eb474e5eef..3d86764273 100644
--- a/dll/win32/softpub/CMakeLists.txt
+++ b/dll/win32/softpub/CMakeLists.txt
@@ -3,7 +3,7 @@ add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
spec2def(softpub.dll softpub.spec)
-add_library(softpub SHARED
+add_library(softpub MODULE
softpub.rc
${CMAKE_CURRENT_BINARY_DIR}/softpub.def)
diff --git a/dll/win32/srclient/CMakeLists.txt b/dll/win32/srclient/CMakeLists.txt
index c65d5d3b65..53f8cf318d 100644
--- a/dll/win32/srclient/CMakeLists.txt
+++ b/dll/win32/srclient/CMakeLists.txt
@@ -6,7 +6,7 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/srclient_stubs.c
${CMAKE_CURRENT_BINARY_DIR}/srclient.def)
-add_library(srclient SHARED ${SOURCE})
+add_library(srclient MODULE ${SOURCE})
set_module_type(srclient win32dll)
add_importlibs(srclient msvcrt kernel32 ntdll)
add_cd_file(TARGET srclient DESTINATION reactos/system32 FOR all)
diff --git a/dll/win32/stdole2.tlb/CMakeLists.txt b/dll/win32/stdole2.tlb/CMakeLists.txt
index ece681090e..162e10c071 100644
--- a/dll/win32/stdole2.tlb/CMakeLists.txt
+++ b/dll/win32/stdole2.tlb/CMakeLists.txt
@@ -9,7 +9,7 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/stdole2.def)
set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/std_ole_v2.tlb)
-add_library(stdole2.tlb SHARED ${SOURCE})
+add_library(stdole2.tlb MODULE ${SOURCE})
set_module_type(stdole2.tlb module)
set_target_properties(stdole2.tlb PROPERTIES SUFFIX "")
add_cd_file(TARGET stdole2.tlb DESTINATION reactos/system32 FOR all)
diff --git a/dll/win32/stdole32.tlb/CMakeLists.txt
b/dll/win32/stdole32.tlb/CMakeLists.txt
index 8c2b9cb292..59b78f8c03 100644
--- a/dll/win32/stdole32.tlb/CMakeLists.txt
+++ b/dll/win32/stdole32.tlb/CMakeLists.txt
@@ -9,7 +9,7 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/stdole32.def)
set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/std_ole_v1.tlb)
-add_library(stdole32.tlb SHARED ${SOURCE})
+add_library(stdole32.tlb MODULE ${SOURCE})
set_module_type(stdole32.tlb module)
set_target_properties(stdole32.tlb PROPERTIES SUFFIX "")
add_cd_file(TARGET stdole32.tlb DESTINATION reactos/system32 FOR all)
diff --git a/dll/win32/sti/CMakeLists.txt b/dll/win32/sti/CMakeLists.txt
index a134aa77a1..e751fda2af 100644
--- a/dll/win32/sti/CMakeLists.txt
+++ b/dll/win32/sti/CMakeLists.txt
@@ -16,7 +16,7 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c
${CMAKE_CURRENT_BINARY_DIR}/sti_wia_p.c)
-add_library(sti SHARED
+add_library(sti MODULE
${SOURCE}
guid.c
sti.rc
diff --git a/dll/win32/streamci/CMakeLists.txt b/dll/win32/streamci/CMakeLists.txt
index c0c903b752..fb83c0f7bb 100644
--- a/dll/win32/streamci/CMakeLists.txt
+++ b/dll/win32/streamci/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
streamci.c
precomp.h)
-add_library(streamci SHARED
+add_library(streamci MODULE
${SOURCE}
streamci.rc
${CMAKE_CURRENT_BINARY_DIR}/streamci.def)
diff --git a/dll/win32/sxs/CMakeLists.txt b/dll/win32/sxs/CMakeLists.txt
index 79d166e036..5df9744465 100644
--- a/dll/win32/sxs/CMakeLists.txt
+++ b/dll/win32/sxs/CMakeLists.txt
@@ -10,7 +10,7 @@ list(APPEND SOURCE
precomp.h
${CMAKE_CURRENT_BINARY_DIR}/sxs_stubs.c)
-add_library(sxs SHARED
+add_library(sxs MODULE
${SOURCE}
guid.c
${CMAKE_CURRENT_BINARY_DIR}/sxs.def)
diff --git a/dll/win32/syssetup/CMakeLists.txt b/dll/win32/syssetup/CMakeLists.txt
index 13286aa643..ab1ab4db45 100644
--- a/dll/win32/syssetup/CMakeLists.txt
+++ b/dll/win32/syssetup/CMakeLists.txt
@@ -12,7 +12,7 @@ list(APPEND SOURCE
precomp.h
${CMAKE_CURRENT_BINARY_DIR}/syssetup_stubs.c)
-add_library(syssetup SHARED
+add_library(syssetup MODULE
${SOURCE}
syssetup.rc
${CMAKE_CURRENT_BINARY_DIR}/syssetup.def)
diff --git a/dll/win32/t2embed/CMakeLists.txt b/dll/win32/t2embed/CMakeLists.txt
index 6453e4a4d4..ecb40360c9 100644
--- a/dll/win32/t2embed/CMakeLists.txt
+++ b/dll/win32/t2embed/CMakeLists.txt
@@ -9,7 +9,7 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/t2embed_stubs.c
${CMAKE_CURRENT_BINARY_DIR}/t2embed.def)
-add_library(t2embed SHARED ${SOURCE} t2embed.rc)
+add_library(t2embed MODULE ${SOURCE} t2embed.rc)
set_module_type(t2embed win32dll UNICODE)
target_link_libraries(t2embed wine)
add_importlibs(t2embed gdi32 user32 advapi32 version msvcrt kernel32 ntdll)
diff --git a/dll/win32/tapi32/CMakeLists.txt b/dll/win32/tapi32/CMakeLists.txt
index 0fc299772b..3c1d617136 100644
--- a/dll/win32/tapi32/CMakeLists.txt
+++ b/dll/win32/tapi32/CMakeLists.txt
@@ -11,7 +11,7 @@ list(APPEND SOURCE
precomp.h
${CMAKE_CURRENT_BINARY_DIR}/tapi32_stubs.c)
-add_library(tapi32 SHARED
+add_library(tapi32 MODULE
${SOURCE}
${CMAKE_CURRENT_BINARY_DIR}/tapi32.def)
diff --git a/dll/win32/tapiui/CMakeLists.txt b/dll/win32/tapiui/CMakeLists.txt
index dc5fe431f5..b48a26de72 100644
--- a/dll/win32/tapiui/CMakeLists.txt
+++ b/dll/win32/tapiui/CMakeLists.txt
@@ -1,5 +1,5 @@
-add_library(tapiui SHARED tapiui.rc)
+add_library(tapiui MODULE tapiui.rc)
set_module_type(tapiui win32dll ENTRYPOINT 0 )
add_dependencies(tapiui psdk)
add_cd_file(TARGET tapiui DESTINATION reactos/system32 FOR all)
diff --git a/dll/win32/themeui/CMakeLists.txt b/dll/win32/themeui/CMakeLists.txt
index dcad389e1e..6f2538967e 100644
--- a/dll/win32/themeui/CMakeLists.txt
+++ b/dll/win32/themeui/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_library(themeui SHARED themeui.rc)
+add_library(themeui MODULE themeui.rc)
set_module_type(themeui win32dll ENTRYPOINT 0)
add_cd_file(TARGET themeui DESTINATION reactos/system32 FOR all)
diff --git a/dll/win32/traffic/CMakeLists.txt b/dll/win32/traffic/CMakeLists.txt
index 98e8446304..85625c63e4 100644
--- a/dll/win32/traffic/CMakeLists.txt
+++ b/dll/win32/traffic/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/traffic_stubs.c
${CMAKE_CURRENT_BINARY_DIR}/traffic.def)
-add_library(traffic SHARED ${SOURCE})
+add_library(traffic MODULE ${SOURCE})
set_module_type(traffic win32dll)
target_link_libraries(traffic wine)
add_importlibs(traffic msvcrt kernel32 ntdll)
diff --git a/dll/win32/twain_32/CMakeLists.txt b/dll/win32/twain_32/CMakeLists.txt
index 2861f22ba2..6a00adfb66 100644
--- a/dll/win32/twain_32/CMakeLists.txt
+++ b/dll/win32/twain_32/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
twain32_main.c
precomp.h)
-add_library(twain_32 SHARED
+add_library(twain_32 MODULE
${SOURCE}
twain_32.rc
${CMAKE_CURRENT_BINARY_DIR}/twain_32.def)
diff --git a/dll/win32/ubtrfs/CMakeLists.txt b/dll/win32/ubtrfs/CMakeLists.txt
index 0f37c4717d..866aecbbe2 100644
--- a/dll/win32/ubtrfs/CMakeLists.txt
+++ b/dll/win32/ubtrfs/CMakeLists.txt
@@ -6,7 +6,7 @@ list(APPEND SOURCE
ubtrfs.rc
${CMAKE_CURRENT_BINARY_DIR}/ubtrfs.def)
-add_library(ubtrfs SHARED ${SOURCE})
+add_library(ubtrfs MODULE ${SOURCE})
set_module_type(ubtrfs nativedll)
target_link_libraries(ubtrfs btrfslib)
add_importlibs(ubtrfs ntdll)
diff --git a/dll/win32/ucdfs/CMakeLists.txt b/dll/win32/ucdfs/CMakeLists.txt
index 9dfe3eab68..c35ad3fdd1 100644
--- a/dll/win32/ucdfs/CMakeLists.txt
+++ b/dll/win32/ucdfs/CMakeLists.txt
@@ -6,7 +6,7 @@ list(APPEND SOURCE
ucdfs.rc
${CMAKE_CURRENT_BINARY_DIR}/ucdfs.def)
-add_library(ucdfs SHARED ${SOURCE})
+add_library(ucdfs MODULE ${SOURCE})
set_module_type(ucdfs nativedll)
target_link_libraries(ucdfs cdfslib)
add_importlibs(ucdfs ntdll)
diff --git a/dll/win32/uext2/CMakeLists.txt b/dll/win32/uext2/CMakeLists.txt
index eef6c63213..ec0480f949 100644
--- a/dll/win32/uext2/CMakeLists.txt
+++ b/dll/win32/uext2/CMakeLists.txt
@@ -6,7 +6,7 @@ list(APPEND SOURCE
uext2.rc
${CMAKE_CURRENT_BINARY_DIR}/uext2.def)
-add_library(uext2 SHARED ${SOURCE})
+add_library(uext2 MODULE ${SOURCE})
set_module_type(uext2 nativedll)
target_link_libraries(uext2 ext2lib)
add_importlibs(uext2 ntdll)
diff --git a/dll/win32/ufat/CMakeLists.txt b/dll/win32/ufat/CMakeLists.txt
index 432af9db09..e58ae95d24 100644
--- a/dll/win32/ufat/CMakeLists.txt
+++ b/dll/win32/ufat/CMakeLists.txt
@@ -6,7 +6,7 @@ list(APPEND SOURCE
ufat.rc
${CMAKE_CURRENT_BINARY_DIR}/ufat.def)
-add_library(ufat SHARED ${SOURCE})
+add_library(ufat MODULE ${SOURCE})
set_module_type(ufat nativedll)
target_link_libraries(ufat vfatlib)
add_importlibs(ufat ntdll)
diff --git a/dll/win32/ufatx/CMakeLists.txt b/dll/win32/ufatx/CMakeLists.txt
index 9f7ce367b6..e9bbeb58ce 100644
--- a/dll/win32/ufatx/CMakeLists.txt
+++ b/dll/win32/ufatx/CMakeLists.txt
@@ -6,7 +6,7 @@ list(APPEND SOURCE
ufatx.rc
${CMAKE_CURRENT_BINARY_DIR}/ufatx.def)
-add_library(ufatx SHARED ${SOURCE})
+add_library(ufatx MODULE ${SOURCE})
set_module_type(ufatx nativedll)
target_link_libraries(ufatx vfatxlib)
add_importlibs(ufatx ntdll)
diff --git a/dll/win32/uffs/CMakeLists.txt b/dll/win32/uffs/CMakeLists.txt
index 63eeee9f5f..2bc8f14e2f 100644
--- a/dll/win32/uffs/CMakeLists.txt
+++ b/dll/win32/uffs/CMakeLists.txt
@@ -6,7 +6,7 @@ list(APPEND SOURCE
uffs.rc
${CMAKE_CURRENT_BINARY_DIR}/uffs.def)
-add_library(uffs SHARED ${SOURCE})
+add_library(uffs MODULE ${SOURCE})
set_module_type(uffs nativedll)
target_link_libraries(uffs ffslib)
add_importlibs(uffs ntdll)
diff --git a/dll/win32/untfs/CMakeLists.txt b/dll/win32/untfs/CMakeLists.txt
index c65863708e..7012263a52 100644
--- a/dll/win32/untfs/CMakeLists.txt
+++ b/dll/win32/untfs/CMakeLists.txt
@@ -6,7 +6,7 @@ list(APPEND SOURCE
untfs.rc
${CMAKE_CURRENT_BINARY_DIR}/untfs.def)
-add_library(untfs SHARED ${SOURCE})
+add_library(untfs MODULE ${SOURCE})
set_module_type(untfs nativedll)
target_link_libraries(untfs ntfslib)
add_importlibs(untfs ntdll)
diff --git a/dll/win32/updspapi/CMakeLists.txt b/dll/win32/updspapi/CMakeLists.txt
index 088e86597e..e27c628b3a 100644
--- a/dll/win32/updspapi/CMakeLists.txt
+++ b/dll/win32/updspapi/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/updspapi_stubs.c
${CMAKE_CURRENT_BINARY_DIR}/updspapi.def)
-add_library(updspapi SHARED ${SOURCE})
+add_library(updspapi MODULE ${SOURCE})
set_module_type(updspapi win32dll)
target_link_libraries(updspapi wine)
add_importlibs(updspapi setupapi msvcrt kernel32 ntdll)
diff --git a/dll/win32/ureiserfs/CMakeLists.txt b/dll/win32/ureiserfs/CMakeLists.txt
index 836fab8769..e08d383598 100644
--- a/dll/win32/ureiserfs/CMakeLists.txt
+++ b/dll/win32/ureiserfs/CMakeLists.txt
@@ -6,7 +6,7 @@ list(APPEND SOURCE
ureiserfs.rc
${CMAKE_CURRENT_BINARY_DIR}/ureiserfs.def)
-add_library(ureiserfs SHARED ${SOURCE})
+add_library(ureiserfs MODULE ${SOURCE})
set_module_type(ureiserfs nativedll)
target_link_libraries(ureiserfs reiserfslib)
add_importlibs(ureiserfs ntdll)
diff --git a/dll/win32/url/CMakeLists.txt b/dll/win32/url/CMakeLists.txt
index e032989d89..6ccecd5288 100644
--- a/dll/win32/url/CMakeLists.txt
+++ b/dll/win32/url/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/url_stubs.c
${CMAKE_CURRENT_BINARY_DIR}/url.def)
-add_library(url SHARED ${SOURCE})
+add_library(url MODULE ${SOURCE})
set_module_type(url win32dll)
target_link_libraries(url wine)
add_importlibs(url shell32 shlwapi msvcrt kernel32 ntdll)
diff --git a/dll/win32/urlmon/CMakeLists.txt b/dll/win32/urlmon/CMakeLists.txt
index 51eeb5abc5..6c7938ff35 100644
--- a/dll/win32/urlmon/CMakeLists.txt
+++ b/dll/win32/urlmon/CMakeLists.txt
@@ -45,7 +45,7 @@ list(APPEND SOURCE
usrmarshal.c
precomp.h)
-add_library(urlmon SHARED
+add_library(urlmon MODULE
${SOURCE}
urlmon.rc
${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c
diff --git a/dll/win32/userenv/CMakeLists.txt b/dll/win32/userenv/CMakeLists.txt
index 4fb503a109..d30c2438a2 100644
--- a/dll/win32/userenv/CMakeLists.txt
+++ b/dll/win32/userenv/CMakeLists.txt
@@ -14,7 +14,7 @@ list(APPEND SOURCE
userenv.c
precomp.h)
-add_library(userenv SHARED
+add_library(userenv MODULE
${SOURCE}
userenv.rc
${CMAKE_CURRENT_BINARY_DIR}/userenv_stubs.c
diff --git a/dll/win32/usp10/CMakeLists.txt b/dll/win32/usp10/CMakeLists.txt
index 25b76c5642..57fc2be44f 100644
--- a/dll/win32/usp10/CMakeLists.txt
+++ b/dll/win32/usp10/CMakeLists.txt
@@ -18,7 +18,7 @@ list(APPEND SOURCE
precomp.h
${CMAKE_CURRENT_BINARY_DIR}/usp10_stubs.c)
-add_library(usp10 SHARED
+add_library(usp10 MODULE
${SOURCE}
${CMAKE_CURRENT_BINARY_DIR}/usp10.def)
diff --git a/dll/win32/uxtheme/CMakeLists.txt b/dll/win32/uxtheme/CMakeLists.txt
index dcdedb11dd..80d31bf44c 100644
--- a/dll/win32/uxtheme/CMakeLists.txt
+++ b/dll/win32/uxtheme/CMakeLists.txt
@@ -19,7 +19,7 @@ list(APPEND SOURCE
uxthemep.h
${CMAKE_CURRENT_BINARY_DIR}/uxtheme_stubs.c)
-add_library(uxtheme SHARED
+add_library(uxtheme MODULE
${SOURCE}
version.rc
${CMAKE_CURRENT_BINARY_DIR}/uxtheme.def)
diff --git a/dll/win32/vbscript/CMakeLists.txt b/dll/win32/vbscript/CMakeLists.txt
index 458cd1c790..d562befb46 100644
--- a/dll/win32/vbscript/CMakeLists.txt
+++ b/dll/win32/vbscript/CMakeLists.txt
@@ -30,7 +30,7 @@ set_source_files_properties(vbscript.rc PROPERTIES OBJECT_DEPENDS
"${vbscript_rc
add_idl_headers(vbscript_idlheader vbscript_classes.idl vbsglobal.idl vbsregexp55.idl)
add_typelib(vbsglobal.idl vbsregexp10.idl vbsregexp55.idl)
-add_library(vbscript SHARED
+add_library(vbscript MODULE
${SOURCE}
vbscript.rc
${CMAKE_CURRENT_BINARY_DIR}/vbscript.def)
diff --git a/dll/win32/verifier/CMakeLists.txt b/dll/win32/verifier/CMakeLists.txt
index df2c1b6896..5e9825bad1 100644
--- a/dll/win32/verifier/CMakeLists.txt
+++ b/dll/win32/verifier/CMakeLists.txt
@@ -6,7 +6,7 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/verifier.def
${CMAKE_CURRENT_BINARY_DIR}/verifier_stubs.c)
-add_library(verifier SHARED ${SOURCE})
+add_library(verifier MODULE ${SOURCE})
set_module_type(verifier win32dll UNICODE ENTRYPOINT DllMain 12)
add_importlibs(verifier ntdll) # Only ntdll!
add_cd_file(TARGET verifier DESTINATION reactos/system32 FOR all)
diff --git a/dll/win32/version/CMakeLists.txt b/dll/win32/version/CMakeLists.txt
index 3d63c8fcb2..2e56518c16 100644
--- a/dll/win32/version/CMakeLists.txt
+++ b/dll/win32/version/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
version.c
${CMAKE_CURRENT_BINARY_DIR}/version.def)
-add_library(version SHARED ${SOURCE} version.rc)
+add_library(version MODULE ${SOURCE} version.rc)
set_module_type(version win32dll)
target_link_libraries(version wine)
add_importlibs(version msvcrt kernel32 ntdll)
diff --git a/dll/win32/vssapi/CMakeLists.txt b/dll/win32/vssapi/CMakeLists.txt
index 5e1ed55145..744f9da911 100644
--- a/dll/win32/vssapi/CMakeLists.txt
+++ b/dll/win32/vssapi/CMakeLists.txt
@@ -12,7 +12,7 @@ if(MSVC AND ARCH STREQUAL "i386")
add_asm_files(vssapi_asm msvc.s)
endif()
-add_library(vssapi SHARED ${SOURCE} ${vssapi_asm})
+add_library(vssapi MODULE ${SOURCE} ${vssapi_asm})
set_module_type(vssapi win32dll)
target_link_libraries(vssapi wine)
add_importlibs(vssapi msvcrt kernel32 ntdll)
diff --git a/dll/win32/wbemdisp/CMakeLists.txt b/dll/win32/wbemdisp/CMakeLists.txt
index 439e110067..974446545d 100644
--- a/dll/win32/wbemdisp/CMakeLists.txt
+++ b/dll/win32/wbemdisp/CMakeLists.txt
@@ -18,7 +18,7 @@ list(APPEND wbemdisp_rc_deps
set_source_files_properties(wbemdisp.rc PROPERTIES OBJECT_DEPENDS
"${wbemdisp_rc_deps}")
-add_library(wbemdisp SHARED
+add_library(wbemdisp MODULE
${SOURCE}
guid.c
wbemdisp.rc
diff --git a/dll/win32/wbemprox/CMakeLists.txt b/dll/win32/wbemprox/CMakeLists.txt
index 5aea8b6621..d11bb0da53 100644
--- a/dll/win32/wbemprox/CMakeLists.txt
+++ b/dll/win32/wbemprox/CMakeLists.txt
@@ -22,7 +22,7 @@ list(APPEND SOURCE
wql.tab.c
precomp.h)
-add_library(wbemprox SHARED
+add_library(wbemprox MODULE
${SOURCE}
guid.c
wbemprox.rc
diff --git a/dll/win32/wdmaud.drv/CMakeLists.txt b/dll/win32/wdmaud.drv/CMakeLists.txt
index 23a65c3e11..16703b0d0f 100644
--- a/dll/win32/wdmaud.drv/CMakeLists.txt
+++ b/dll/win32/wdmaud.drv/CMakeLists.txt
@@ -14,7 +14,7 @@ list(APPEND SOURCE
legacy.c
wdmaud.h)
-add_library(wdmaud.drv SHARED
+add_library(wdmaud.drv MODULE
${SOURCE}
wdmaud.rc
${CMAKE_CURRENT_BINARY_DIR}/wdmaud.def)
diff --git a/dll/win32/windowscodecs/CMakeLists.txt
b/dll/win32/windowscodecs/CMakeLists.txt
index 6c67bfe1a9..72cea6d42a 100644
--- a/dll/win32/windowscodecs/CMakeLists.txt
+++ b/dll/win32/windowscodecs/CMakeLists.txt
@@ -70,7 +70,7 @@ list(APPEND ADDITIONAL_SOURCE
${CMAKE_CURRENT_BINARY_DIR}/windowscodecs.def
${CMAKE_CURRENT_BINARY_DIR}/windowscodecs_wincodec_p.c)
-add_library(windowscodecs SHARED
+add_library(windowscodecs MODULE
${SOURCE}
${ADDITIONAL_SOURCE})
diff --git a/dll/win32/windowscodecsext/CMakeLists.txt
b/dll/win32/windowscodecsext/CMakeLists.txt
index e198889342..da3505e34f 100644
--- a/dll/win32/windowscodecsext/CMakeLists.txt
+++ b/dll/win32/windowscodecsext/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
main.c
${CMAKE_CURRENT_BINARY_DIR}/windowscodecsext.def)
-add_library(windowscodecsext SHARED ${SOURCE})
+add_library(windowscodecsext MODULE ${SOURCE})
set_module_type(windowscodecsext win32dll)
target_link_libraries(windowscodecsext wine)
add_importlibs(windowscodecsext ole32 msvcrt kernel32 ntdll)
diff --git a/dll/win32/winemp3.acm/CMakeLists.txt b/dll/win32/winemp3.acm/CMakeLists.txt
index 3ad86b6c51..4d428baa45 100644
--- a/dll/win32/winemp3.acm/CMakeLists.txt
+++ b/dll/win32/winemp3.acm/CMakeLists.txt
@@ -9,7 +9,7 @@ include_directories(
spec2def(winemp3.acm winemp3.acm.spec)
-add_library(winemp3.acm SHARED
+add_library(winemp3.acm MODULE
mpegl3.c
${CMAKE_CURRENT_BINARY_DIR}/winemp3.def)
diff --git a/dll/win32/winfax/CMakeLists.txt b/dll/win32/winfax/CMakeLists.txt
index 830d8e62fb..5913515ce2 100644
--- a/dll/win32/winfax/CMakeLists.txt
+++ b/dll/win32/winfax/CMakeLists.txt
@@ -6,7 +6,7 @@ list(APPEND SOURCE
winfax.rc
${CMAKE_CURRENT_BINARY_DIR}/winfax.def)
-add_library(winfax SHARED ${SOURCE})
+add_library(winfax MODULE ${SOURCE})
set_module_type(winfax win32dll)
add_importlibs(winfax msvcrt kernel32 ntdll)
add_cd_file(TARGET winfax DESTINATION reactos/system32 FOR all)
diff --git a/dll/win32/wing32/CMakeLists.txt b/dll/win32/wing32/CMakeLists.txt
index a4980b8eb2..74f53245d6 100644
--- a/dll/win32/wing32/CMakeLists.txt
+++ b/dll/win32/wing32/CMakeLists.txt
@@ -5,7 +5,7 @@ list(APPEND SOURCE
wing32.c
${CMAKE_CURRENT_BINARY_DIR}/wing32.def)
-add_library(wing32 SHARED ${SOURCE})
+add_library(wing32 MODULE ${SOURCE})
set_module_type(wing32 win32dll UNICODE)
add_importlibs(wing32 user32 gdi32 msvcrt kernel32)
add_cd_file(TARGET wing32 DESTINATION reactos/system32 FOR all)
diff --git a/dll/win32/winhttp/CMakeLists.txt b/dll/win32/winhttp/CMakeLists.txt
index 988c769b0b..f0dca0805e 100644
--- a/dll/win32/winhttp/CMakeLists.txt
+++ b/dll/win32/winhttp/CMakeLists.txt
@@ -22,7 +22,7 @@ list(APPEND SOURCE
set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/winhttp_tlb.tlb)
add_typelib(winhttp_tlb.idl)
-add_library(winhttp SHARED
+add_library(winhttp MODULE
${SOURCE}
rsrc.rc
${CMAKE_CURRENT_BINARY_DIR}/winhttp.def)
diff --git a/dll/win32/wininet/CMakeLists.txt b/dll/win32/wininet/CMakeLists.txt
index fc12adf7e5..3389140c1d 100644
--- a/dll/win32/wininet/CMakeLists.txt
+++ b/dll/win32/wininet/CMakeLists.txt
@@ -24,7 +24,7 @@ list(APPEND SOURCE
utility.c
precomp.h)
-add_library(wininet SHARED
+add_library(wininet MODULE
${SOURCE}
rsrc.rc
${CMAKE_CURRENT_BINARY_DIR}/wininet_stubs.c
diff --git a/dll/win32/winmm/CMakeLists.txt b/dll/win32/winmm/CMakeLists.txt
index eb3cbecbbe..616680b2ec 100644
... 2716 lines suppressed ...