git: 1f3b9362b92c - main - emulators/wine-devel: Fix build on i386

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Robert Clausecker <fuz_at_FreeBSD.org>
Date: Tue, 07 Nov 2023 00:20:40 UTC
The branch main has been updated by fuz:

URL: https://cgit.FreeBSD.org/ports/commit/?id=1f3b9362b92cc5ad2af60dfbf6d7a9ebad1076fc

commit 1f3b9362b92cc5ad2af60dfbf6d7a9ebad1076fc
Author:     Alastair Hogge <agh@riseup.net>
AuthorDate: 2023-11-04 11:38:45 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2023-11-07 00:16:50 +0000

    emulators/wine-devel: Fix build on i386
    
    Fix pkg-plist to restore building on i386.
    Also sort the following in pkg-plist:
    include/wine/svcctl.h
    include/wine/svcctl.idl
    
    PR:             274905
---
 emulators/wine-devel/pkg-plist | 133 ++++++++++++++++++++++++++++++-----------
 1 file changed, 98 insertions(+), 35 deletions(-)

diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist
index 4d64d3f0b50e..a46da91394f5 100644
--- a/emulators/wine-devel/pkg-plist
+++ b/emulators/wine-devel/pkg-plist
@@ -34,8 +34,6 @@ include/wine/itss.h
 include/wine/itss.idl
 include/wine/mfinternal.h
 include/wine/mfinternal.idl
-include/wine/svcctl.h
-include/wine/svcctl.idl
 include/wine/msvcrt/assert.h
 include/wine/msvcrt/complex.h
 include/wine/msvcrt/conio.h
@@ -98,6 +96,8 @@ include/wine/msvcrt/unistd.h
 include/wine/msvcrt/vadefs.h
 include/wine/msvcrt/wchar.h
 include/wine/msvcrt/wctype.h
+include/wine/svcctl.h
+include/wine/svcctl.idl
 include/wine/windows/accctrl.h
 include/wine/windows/access.idl
 include/wine/windows/aclapi.h
@@ -350,6 +350,34 @@ include/wine/windows/dcomptypes.idl
 include/wine/windows/dde.h
 include/wine/windows/dde.rh
 include/wine/windows/ddeml.h
+%%WINE64%%include/wine/windows/ddk/compstui.h
+%%WINE64%%include/wine/windows/ddk/csq.h
+%%WINE64%%include/wine/windows/ddk/d3dkmthk.h
+%%WINE64%%include/wine/windows/ddk/fltkernel.h
+%%WINE64%%include/wine/windows/ddk/hidclass.h
+%%WINE64%%include/wine/windows/ddk/hidpddi.h
+%%WINE64%%include/wine/windows/ddk/hidpi.h
+%%WINE64%%include/wine/windows/ddk/hidport.h
+%%WINE64%%include/wine/windows/ddk/hidsdi.h
+%%WINE64%%include/wine/windows/ddk/hidtypes.h
+%%WINE64%%include/wine/windows/ddk/mountmgr.h
+%%WINE64%%include/wine/windows/ddk/ndis.h
+%%WINE64%%include/wine/windows/ddk/ntddcdvd.h
+%%WINE64%%include/wine/windows/ddk/ntddk.h
+%%WINE64%%include/wine/windows/ddk/ntddser.h
+%%WINE64%%include/wine/windows/ddk/ntddtape.h
+%%WINE64%%include/wine/windows/ddk/ntifs.h
+%%WINE64%%include/wine/windows/ddk/usb.h
+%%WINE64%%include/wine/windows/ddk/usb100.h
+%%WINE64%%include/wine/windows/ddk/usb200.h
+%%WINE64%%include/wine/windows/ddk/usbdlib.h
+%%WINE64%%include/wine/windows/ddk/usbioctl.h
+%%WINE64%%include/wine/windows/ddk/usbiodef.h
+%%WINE64%%include/wine/windows/ddk/wdm.h
+%%WINE64%%include/wine/windows/ddk/winddi.h
+%%WINE64%%include/wine/windows/ddk/winddiui.h
+%%WINE64%%include/wine/windows/ddk/winsplp.h
+%%WINE64%%include/wine/windows/ddk/wsk.h
 include/wine/windows/ddraw.h
 include/wine/windows/ddrawgdi.h
 include/wine/windows/ddrawi.h
@@ -1274,34 +1302,6 @@ include/wine/windows/xpsobjectmodel.idl
 include/wine/windows/xpsobjectmodel_1.h
 include/wine/windows/xpsobjectmodel_1.idl
 include/wine/windows/zmouse.h
-include/wine/windows/ddk/compstui.h
-include/wine/windows/ddk/csq.h
-include/wine/windows/ddk/d3dkmthk.h
-include/wine/windows/ddk/fltkernel.h
-include/wine/windows/ddk/hidclass.h
-include/wine/windows/ddk/hidpddi.h
-include/wine/windows/ddk/hidpi.h
-include/wine/windows/ddk/hidport.h
-include/wine/windows/ddk/hidsdi.h
-include/wine/windows/ddk/hidtypes.h
-include/wine/windows/ddk/mountmgr.h
-include/wine/windows/ddk/ndis.h
-include/wine/windows/ddk/ntddcdvd.h
-include/wine/windows/ddk/ntddk.h
-include/wine/windows/ddk/ntddser.h
-include/wine/windows/ddk/ntddtape.h
-include/wine/windows/ddk/ntifs.h
-include/wine/windows/ddk/usb.h
-include/wine/windows/ddk/usb100.h
-include/wine/windows/ddk/usb200.h
-include/wine/windows/ddk/usbdlib.h
-include/wine/windows/ddk/usbioctl.h
-include/wine/windows/ddk/usbiodef.h
-include/wine/windows/ddk/wdm.h
-include/wine/windows/ddk/winddi.h
-include/wine/windows/ddk/winddiui.h
-include/wine/windows/ddk/winsplp.h
-include/wine/windows/ddk/wsk.h
 lib/wine/%%WINEARCH%%-unix/acledit.dll.so
 lib/wine/%%WINEARCH%%-unix/aclui.dll.so
 lib/wine/%%WINEARCH%%-unix/activeds.dll.so
@@ -1329,6 +1329,7 @@ lib/wine/%%WINEARCH%%-unix/authz.dll.so
 lib/wine/%%WINEARCH%%-unix/avicap32.dll.so
 lib/wine/%%WINEARCH%%-unix/avicap32.so
 lib/wine/%%WINEARCH%%-unix/avifil32.dll.so
+%%WINE32%%lib/wine/%%WINEARCH%%-unix/avifile.dll16.so
 lib/wine/%%WINEARCH%%-unix/avrt.dll.so
 lib/wine/%%WINEARCH%%-unix/bcrypt.dll.so
 lib/wine/%%WINEARCH%%-unix/bcrypt.so
@@ -1352,6 +1353,9 @@ lib/wine/%%WINEARCH%%-unix/combase.dll.so
 lib/wine/%%WINEARCH%%-unix/comcat.dll.so
 lib/wine/%%WINEARCH%%-unix/comctl32.dll.so
 lib/wine/%%WINEARCH%%-unix/comdlg32.dll.so
+%%WINE32%%lib/wine/%%WINEARCH%%-unix/comm.drv16.so
+%%WINE32%%lib/wine/%%WINEARCH%%-unix/commdlg.dll16.so
+%%WINE32%%lib/wine/%%WINEARCH%%-unix/compobj.dll16.so
 lib/wine/%%WINEARCH%%-unix/compstui.dll.so
 lib/wine/%%WINEARCH%%-unix/comsvcs.dll.so
 lib/wine/%%WINEARCH%%-unix/concrt140.dll.so
@@ -1372,7 +1376,9 @@ lib/wine/%%WINEARCH%%-unix/cryptui.dll.so
 lib/wine/%%WINEARCH%%-unix/cscript.exe.so
 lib/wine/%%WINEARCH%%-unix/ctapi32.dll.so
 lib/wine/%%WINEARCH%%-unix/ctapi32.so
+%%WINE32%%lib/wine/%%WINEARCH%%-unix/ctl3d.dll16.so
 lib/wine/%%WINEARCH%%-unix/ctl3d32.dll.so
+%%WINE32%%lib/wine/%%WINEARCH%%-unix/ctl3dv2.dll16.so
 lib/wine/%%WINEARCH%%-unix/d2d1.dll.so
 lib/wine/%%WINEARCH%%-unix/d3d10.dll.so
 lib/wine/%%WINEARCH%%-unix/d3d10_1.dll.so
@@ -1438,6 +1444,7 @@ lib/wine/%%WINEARCH%%-unix/dbgeng.dll.so
 lib/wine/%%WINEARCH%%-unix/dbghelp.dll.so
 lib/wine/%%WINEARCH%%-unix/dciman32.dll.so
 lib/wine/%%WINEARCH%%-unix/dcomp.dll.so
+%%WINE32%%lib/wine/%%WINEARCH%%-unix/ddeml.dll16.so
 lib/wine/%%WINEARCH%%-unix/ddraw.dll.so
 lib/wine/%%WINEARCH%%-unix/ddrawex.dll.so
 lib/wine/%%WINEARCH%%-unix/devenum.dll.so
@@ -1450,7 +1457,9 @@ lib/wine/%%WINEARCH%%-unix/dinput.dll.so
 lib/wine/%%WINEARCH%%-unix/dinput8.dll.so
 lib/wine/%%WINEARCH%%-unix/directmanipulation.dll.so
 lib/wine/%%WINEARCH%%-unix/dism.exe.so
+%%WINE32%%lib/wine/%%WINEARCH%%-unix/dispdib.dll16.so
 lib/wine/%%WINEARCH%%-unix/dispex.dll.so
+%%WINE32%%lib/wine/%%WINEARCH%%-unix/display.drv16.so
 lib/wine/%%WINEARCH%%-unix/dllhost.exe.so
 lib/wine/%%WINEARCH%%-unix/dmband.dll.so
 lib/wine/%%WINEARCH%%-unix/dmcompos.dll.so
@@ -1513,6 +1522,7 @@ lib/wine/%%WINEARCH%%-unix/fusion.dll.so
 lib/wine/%%WINEARCH%%-unix/fwpuclnt.dll.so
 lib/wine/%%WINEARCH%%-unix/gameux.dll.so
 lib/wine/%%WINEARCH%%-unix/gamingtcui.dll.so
+%%WINE32%%lib/wine/%%WINEARCH%%-unix/gdi.exe16.so
 lib/wine/%%WINEARCH%%-unix/gdi32.dll.so
 lib/wine/%%WINEARCH%%-unix/gdiplus.dll.so
 lib/wine/%%WINEARCH%%-unix/geolocation.dll.so
@@ -1539,8 +1549,10 @@ lib/wine/%%WINEARCH%%-unix/icinfo.exe.so
 lib/wine/%%WINEARCH%%-unix/ieframe.dll.so
 lib/wine/%%WINEARCH%%-unix/ieproxy.dll.so
 lib/wine/%%WINEARCH%%-unix/iexplore.exe.so
+%%WINE32%%lib/wine/%%WINEARCH%%-unix/ifsmgr.vxd.so
 lib/wine/%%WINEARCH%%-unix/imaadp32.acm.so
 lib/wine/%%WINEARCH%%-unix/imagehlp.dll.so
+%%WINE32%%lib/wine/%%WINEARCH%%-unix/imm.dll16.so
 lib/wine/%%WINEARCH%%-unix/imm32.dll.so
 lib/wine/%%WINEARCH%%-unix/inetcomm.dll.so
 lib/wine/%%WINEARCH%%-unix/inetcpl.cpl.so
@@ -1561,7 +1573,9 @@ lib/wine/%%WINEARCH%%-unix/jscript.dll.so
 lib/wine/%%WINEARCH%%-unix/jsproxy.dll.so
 lib/wine/%%WINEARCH%%-unix/kernel32.dll.so
 lib/wine/%%WINEARCH%%-unix/kernelbase.dll.so
+%%WINE32%%lib/wine/%%WINEARCH%%-unix/keyboard.drv16.so
 lib/wine/%%WINEARCH%%-unix/klist.exe.so
+%%WINE32%%lib/wine/%%WINEARCH%%-unix/krnl386.exe16.so
 lib/wine/%%WINEARCH%%-unix/ksecdd.sys.so
 lib/wine/%%WINEARCH%%-unix/ksproxy.ax.so
 lib/wine/%%WINEARCH%%-unix/ksuser.dll.so
@@ -1804,6 +1818,7 @@ lib/wine/%%WINEARCH%%-unix/localspl.dll.so
 lib/wine/%%WINEARCH%%-unix/localspl.so
 lib/wine/%%WINEARCH%%-unix/localui.dll.so
 lib/wine/%%WINEARCH%%-unix/lodctr.exe.so
+%%WINE32%%lib/wine/%%WINEARCH%%-unix/lzexpand.dll16.so
 lib/wine/%%WINEARCH%%-unix/magnification.dll.so
 lib/wine/%%WINEARCH%%-unix/mapi32.dll.so
 lib/wine/%%WINEARCH%%-unix/mapistub.dll.so
@@ -1824,12 +1839,17 @@ lib/wine/%%WINEARCH%%-unix/midimap.dll.so
 lib/wine/%%WINEARCH%%-unix/mlang.dll.so
 lib/wine/%%WINEARCH%%-unix/mmcndmgr.dll.so
 lib/wine/%%WINEARCH%%-unix/mmdevapi.dll.so
+%%WINE32%%lib/wine/%%WINEARCH%%-unix/mmdevldr.vxd.so
+%%WINE32%%lib/wine/%%WINEARCH%%-unix/mmsystem.dll16.so
 lib/wine/%%WINEARCH%%-unix/mofcomp.exe.so
+%%WINE32%%lib/wine/%%WINEARCH%%-unix/monodebg.vxd.so
 lib/wine/%%WINEARCH%%-unix/mountmgr.so
 lib/wine/%%WINEARCH%%-unix/mountmgr.sys.so
+%%WINE32%%lib/wine/%%WINEARCH%%-unix/mouse.drv16.so
 lib/wine/%%WINEARCH%%-unix/mp3dmod.dll.so
 lib/wine/%%WINEARCH%%-unix/mpr.dll.so
 lib/wine/%%WINEARCH%%-unix/mprapi.dll.so
+%%WINE32%%lib/wine/%%WINEARCH%%-unix/msacm.dll16.so
 lib/wine/%%WINEARCH%%-unix/msacm32.dll.so
 lib/wine/%%WINEARCH%%-unix/msacm32.drv.so
 lib/wine/%%WINEARCH%%-unix/msado15.dll.so
@@ -1906,6 +1926,7 @@ lib/wine/%%WINEARCH%%-unix/msvcrt40.dll.so
 lib/wine/%%WINEARCH%%-unix/msvcrtd.dll.so
 lib/wine/%%WINEARCH%%-unix/msvfw32.dll.so
 lib/wine/%%WINEARCH%%-unix/msvidc32.dll.so
+%%WINE32%%lib/wine/%%WINEARCH%%-unix/msvideo.dll16.so
 lib/wine/%%WINEARCH%%-unix/mswsock.dll.so
 lib/wine/%%WINEARCH%%-unix/msxml.dll.so
 lib/wine/%%WINEARCH%%-unix/msxml2.dll.so
@@ -1945,13 +1966,21 @@ lib/wine/%%WINEARCH%%-unix/odbc32.so
 lib/wine/%%WINEARCH%%-unix/odbcbcp.dll.so
 lib/wine/%%WINEARCH%%-unix/odbccp32.dll.so
 lib/wine/%%WINEARCH%%-unix/odbccu32.dll.so
+%%WINE32%%lib/wine/%%WINEARCH%%-unix/ole2.dll16.so
+%%WINE32%%lib/wine/%%WINEARCH%%-unix/ole2conv.dll16.so
+%%WINE32%%lib/wine/%%WINEARCH%%-unix/ole2disp.dll16.so
+%%WINE32%%lib/wine/%%WINEARCH%%-unix/ole2nls.dll16.so
+%%WINE32%%lib/wine/%%WINEARCH%%-unix/ole2prox.dll16.so
+%%WINE32%%lib/wine/%%WINEARCH%%-unix/ole2thk.dll16.so
 lib/wine/%%WINEARCH%%-unix/ole32.dll.so
 lib/wine/%%WINEARCH%%-unix/oleacc.dll.so
 lib/wine/%%WINEARCH%%-unix/oleaut32.dll.so
+%%WINE32%%lib/wine/%%WINEARCH%%-unix/olecli.dll16.so
 lib/wine/%%WINEARCH%%-unix/olecli32.dll.so
 lib/wine/%%WINEARCH%%-unix/oledb32.dll.so
 lib/wine/%%WINEARCH%%-unix/oledlg.dll.so
 lib/wine/%%WINEARCH%%-unix/olepro32.dll.so
+%%WINE32%%lib/wine/%%WINEARCH%%-unix/olesvr.dll16.so
 lib/wine/%%WINEARCH%%-unix/olesvr32.dll.so
 lib/wine/%%WINEARCH%%-unix/olethk32.dll.so
 lib/wine/%%WINEARCH%%-unix/oleview.exe.so
@@ -1985,6 +2014,7 @@ lib/wine/%%WINEARCH%%-unix/qmgrprxy.dll.so
 lib/wine/%%WINEARCH%%-unix/quartz.dll.so
 lib/wine/%%WINEARCH%%-unix/query.dll.so
 lib/wine/%%WINEARCH%%-unix/qwave.dll.so
+%%WINE32%%lib/wine/%%WINEARCH%%-unix/rasapi16.dll16.so
 lib/wine/%%WINEARCH%%-unix/rasapi32.dll.so
 lib/wine/%%WINEARCH%%-unix/rasdlg.dll.so
 lib/wine/%%WINEARCH%%-unix/reg.exe.so
@@ -2005,6 +2035,7 @@ lib/wine/%%WINEARCH%%-unix/rsaenh.dll.so
 lib/wine/%%WINEARCH%%-unix/rstrtmgr.dll.so
 lib/wine/%%WINEARCH%%-unix/rtutils.dll.so
 lib/wine/%%WINEARCH%%-unix/rtworkq.dll.so
+%%WINE32%%lib/wine/%%WINEARCH%%-unix/rundll.exe16.so
 lib/wine/%%WINEARCH%%-unix/rundll32.exe.so
 lib/wine/%%WINEARCH%%-unix/samlib.dll.so
 lib/wine/%%WINEARCH%%-unix/sapi.dll.so
@@ -2029,10 +2060,12 @@ lib/wine/%%WINEARCH%%-unix/serialui.dll.so
 lib/wine/%%WINEARCH%%-unix/servicemodelreg.exe.so
 lib/wine/%%WINEARCH%%-unix/services.exe.so
 lib/wine/%%WINEARCH%%-unix/setupapi.dll.so
+%%WINE32%%lib/wine/%%WINEARCH%%-unix/setupx.dll16.so
 lib/wine/%%WINEARCH%%-unix/setx.exe.so
 lib/wine/%%WINEARCH%%-unix/sfc_os.dll.so
 lib/wine/%%WINEARCH%%-unix/shcore.dll.so
 lib/wine/%%WINEARCH%%-unix/shdocvw.dll.so
+%%WINE32%%lib/wine/%%WINEARCH%%-unix/shell.dll16.so
 lib/wine/%%WINEARCH%%-unix/shell32.dll.so
 lib/wine/%%WINEARCH%%-unix/shfolder.dll.so
 lib/wine/%%WINEARCH%%-unix/shlwapi.dll.so
@@ -2041,6 +2074,7 @@ lib/wine/%%WINEARCH%%-unix/slbcsp.dll.so
 lib/wine/%%WINEARCH%%-unix/slc.dll.so
 lib/wine/%%WINEARCH%%-unix/snmpapi.dll.so
 lib/wine/%%WINEARCH%%-unix/softpub.dll.so
+%%WINE32%%lib/wine/%%WINEARCH%%-unix/sound.drv16.so
 lib/wine/%%WINEARCH%%-unix/spoolss.dll.so
 lib/wine/%%WINEARCH%%-unix/spoolsv.exe.so
 lib/wine/%%WINEARCH%%-unix/sppc.dll.so
@@ -2050,11 +2084,14 @@ lib/wine/%%WINEARCH%%-unix/srvsvc.dll.so
 lib/wine/%%WINEARCH%%-unix/sspicli.dll.so
 lib/wine/%%WINEARCH%%-unix/start.exe.so
 lib/wine/%%WINEARCH%%-unix/sti.dll.so
+%%WINE32%%lib/wine/%%WINEARCH%%-unix/storage.dll16.so
+%%WINE32%%lib/wine/%%WINEARCH%%-unix/stress.dll16.so
 lib/wine/%%WINEARCH%%-unix/strmdll.dll.so
 lib/wine/%%WINEARCH%%-unix/subst.exe.so
 lib/wine/%%WINEARCH%%-unix/svchost.exe.so
 lib/wine/%%WINEARCH%%-unix/svrapi.dll.so
 lib/wine/%%WINEARCH%%-unix/sxs.dll.so
+%%WINE32%%lib/wine/%%WINEARCH%%-unix/system.drv16.so
 lib/wine/%%WINEARCH%%-unix/systeminfo.exe.so
 lib/wine/%%WINEARCH%%-unix/t2embed.dll.so
 lib/wine/%%WINEARCH%%-unix/tapi32.dll.so
@@ -2067,9 +2104,12 @@ lib/wine/%%WINEARCH%%-unix/tdh.dll.so
 lib/wine/%%WINEARCH%%-unix/tdi.sys.so
 lib/wine/%%WINEARCH%%-unix/termsv.exe.so
 lib/wine/%%WINEARCH%%-unix/threadpoolwinrt.dll.so
+%%WINE32%%lib/wine/%%WINEARCH%%-unix/toolhelp.dll16.so
 lib/wine/%%WINEARCH%%-unix/traffic.dll.so
+%%WINE32%%lib/wine/%%WINEARCH%%-unix/twain.dll16.so
 lib/wine/%%WINEARCH%%-unix/twain_32.dll.so
 lib/wine/%%WINEARCH%%-unix/twinapi.appcore.dll.so
+%%WINE32%%lib/wine/%%WINEARCH%%-unix/typelib.dll16.so
 lib/wine/%%WINEARCH%%-unix/ucrtbase.dll.so
 lib/wine/%%WINEARCH%%-unix/uianimation.dll.so
 lib/wine/%%WINEARCH%%-unix/uiautomationcore.dll.so
@@ -2081,6 +2121,7 @@ lib/wine/%%WINEARCH%%-unix/updspapi.dll.so
 lib/wine/%%WINEARCH%%-unix/url.dll.so
 lib/wine/%%WINEARCH%%-unix/urlmon.dll.so
 lib/wine/%%WINEARCH%%-unix/usbd.sys.so
+%%WINE32%%lib/wine/%%WINEARCH%%-unix/user.exe16.so
 lib/wine/%%WINEARCH%%-unix/user32.dll.so
 lib/wine/%%WINEARCH%%-unix/userenv.dll.so
 lib/wine/%%WINEARCH%%-unix/utildll.dll.so
@@ -2093,14 +2134,23 @@ lib/wine/%%WINEARCH%%-unix/vcomp120.dll.so
 lib/wine/%%WINEARCH%%-unix/vcomp140.dll.so
 lib/wine/%%WINEARCH%%-unix/vcomp90.dll.so
 lib/wine/%%WINEARCH%%-unix/vcruntime140.dll.so
-lib/wine/%%WINEARCH%%-unix/vcruntime140_1.dll.so
+%%WINE64%%lib/wine/%%WINEARCH%%-unix/vcruntime140_1.dll.so
+%%WINE32%%lib/wine/%%WINEARCH%%-unix/vdhcp.vxd.so
 lib/wine/%%WINEARCH%%-unix/vdmdbg.dll.so
+%%WINE32%%lib/wine/%%WINEARCH%%-unix/ver.dll16.so
 lib/wine/%%WINEARCH%%-unix/version.dll.so
 lib/wine/%%WINEARCH%%-unix/vga.dll.so
 lib/wine/%%WINEARCH%%-unix/view.exe.so
 lib/wine/%%WINEARCH%%-unix/virtdisk.dll.so
+%%WINE32%%lib/wine/%%WINEARCH%%-unix/vmm.vxd.so
+%%WINE32%%lib/wine/%%WINEARCH%%-unix/vnbt.vxd.so
+%%WINE32%%lib/wine/%%WINEARCH%%-unix/vnetbios.vxd.so
 lib/wine/%%WINEARCH%%-unix/vssapi.dll.so
+%%WINE32%%lib/wine/%%WINEARCH%%-unix/vtdapi.vxd.so
 lib/wine/%%WINEARCH%%-unix/vulkan-1.dll.so
+%%WINE32%%lib/wine/%%WINEARCH%%-unix/vwin32.vxd.so
+%%WINE32%%lib/wine/%%WINEARCH%%-unix/w32skrnl.dll.so
+%%WINE32%%lib/wine/%%WINEARCH%%-unix/w32sys.dll16.so
 lib/wine/%%WINEARCH%%-unix/wbemdisp.dll.so
 lib/wine/%%WINEARCH%%-unix/wbemprox.dll.so
 lib/wine/%%WINEARCH%%-unix/wdscore.dll.so
@@ -2114,8 +2164,12 @@ lib/wine/%%WINEARCH%%-unix/where.exe.so
 lib/wine/%%WINEARCH%%-unix/whoami.exe.so
 lib/wine/%%WINEARCH%%-unix/wiaservc.dll.so
 lib/wine/%%WINEARCH%%-unix/wimgapi.dll.so
+%%WINE32%%lib/wine/%%WINEARCH%%-unix/win32s16.dll16.so
 lib/wine/%%WINEARCH%%-unix/win32u.dll.so
 lib/wine/%%WINEARCH%%-unix/win32u.so
+%%WINE32%%lib/wine/%%WINEARCH%%-unix/win87em.dll16.so
+%%WINE32%%lib/wine/%%WINEARCH%%-unix/winaspi.dll16.so
+%%WINE32%%lib/wine/%%WINEARCH%%-unix/windebug.dll16.so
 lib/wine/%%WINEARCH%%-unix/windows.applicationmodel.dll.so
 lib/wine/%%WINEARCH%%-unix/windows.devices.bluetooth.dll.so
 lib/wine/%%WINEARCH%%-unix/windows.devices.enumeration.dll.so
@@ -2160,22 +2214,30 @@ lib/wine/%%WINEARCH%%-unix/winemsibuilder.exe.so
 lib/wine/%%WINEARCH%%-unix/winepath.exe.so
 lib/wine/%%WINEARCH%%-unix/wineps.drv.so
 lib/wine/%%WINEARCH%%-unix/wineps.so
+%%WINE32%%lib/wine/%%WINEARCH%%-unix/wineps16.drv16.so
+%%WINE32%%lib/wine/%%WINEARCH%%-unix/winevdm.exe.so
 lib/wine/%%WINEARCH%%-unix/winevulkan.dll.so
 lib/wine/%%WINEARCH%%-unix/winevulkan.so
 %%X11%%lib/wine/%%WINEARCH%%-unix/winex11.drv.so
 %%X11%%lib/wine/%%WINEARCH%%-unix/winex11.so
 lib/wine/%%WINEARCH%%-unix/winexinput.sys.so
+%%WINE32%%lib/wine/%%WINEARCH%%-unix/wing.dll16.so
 lib/wine/%%WINEARCH%%-unix/wing32.dll.so
+%%WINE32%%lib/wine/%%WINEARCH%%-unix/winhelp.exe16.so
 lib/wine/%%WINEARCH%%-unix/winhlp32.exe.so
 lib/wine/%%WINEARCH%%-unix/winhttp.dll.so
 lib/wine/%%WINEARCH%%-unix/wininet.dll.so
 lib/wine/%%WINEARCH%%-unix/winmgmt.exe.so
 lib/wine/%%WINEARCH%%-unix/winmm.dll.so
+%%WINE32%%lib/wine/%%WINEARCH%%-unix/winnls.dll16.so
 lib/wine/%%WINEARCH%%-unix/winnls32.dll.so
+%%WINE32%%lib/wine/%%WINEARCH%%-unix/winoldap.mod16.so
 lib/wine/%%WINEARCH%%-unix/winprint.dll.so
+%%WINE32%%lib/wine/%%WINEARCH%%-unix/winsock.dll16.so
 lib/wine/%%WINEARCH%%-unix/winspool.drv.so
 lib/wine/%%WINEARCH%%-unix/winspool.so
 lib/wine/%%WINEARCH%%-unix/winsta.dll.so
+%%WINE32%%lib/wine/%%WINEARCH%%-unix/wintab.dll16.so
 lib/wine/%%WINEARCH%%-unix/wintab32.dll.so
 lib/wine/%%WINEARCH%%-unix/wintrust.dll.so
 lib/wine/%%WINEARCH%%-unix/wintypes.dll.so
@@ -2195,9 +2257,10 @@ lib/wine/%%WINEARCH%%-unix/wmvcore.dll.so
 lib/wine/%%WINEARCH%%-unix/wnaspi32.dll.so
 lib/wine/%%WINEARCH%%-unix/wofutil.dll.so
 lib/wine/%%WINEARCH%%-unix/wordpad.exe.so
-lib/wine/%%WINEARCH%%-unix/wow64.dll.so
-lib/wine/%%WINEARCH%%-unix/wow64cpu.dll.so
-lib/wine/%%WINEARCH%%-unix/wow64win.dll.so
+%%WINE32%%lib/wine/%%WINEARCH%%-unix/wow32.dll.so
+%%WINE64%%lib/wine/%%WINEARCH%%-unix/wow64.dll.so
+%%WINE64%%lib/wine/%%WINEARCH%%-unix/wow64cpu.dll.so
+%%WINE64%%lib/wine/%%WINEARCH%%-unix/wow64win.dll.so
 lib/wine/%%WINEARCH%%-unix/wpc.dll.so
 lib/wine/%%WINEARCH%%-unix/write.exe.so
 lib/wine/%%WINEARCH%%-unix/ws2_32.dll.so
@@ -2858,7 +2921,7 @@ lib/wine/%%WINEARCH%%-windows/vcomp120.dll
 lib/wine/%%WINEARCH%%-windows/vcomp140.dll
 lib/wine/%%WINEARCH%%-windows/vcomp90.dll
 lib/wine/%%WINEARCH%%-windows/vcruntime140.dll
-lib/wine/%%WINEARCH%%-windows/vcruntime140_1.dll
+%%WINE64%%lib/wine/%%WINEARCH%%-windows/vcruntime140_1.dll
 %%WINE32%%lib/wine/%%WINEARCH%%-windows/vdhcp.vxd
 lib/wine/%%WINEARCH%%-windows/vdmdbg.dll
 %%WINE32%%lib/wine/%%WINEARCH%%-windows/ver.dll16