From 4fd617a32f99f71c648d74b0a81ca29133cfaf18 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Mon, 5 Jun 2023 00:41:34 +0200 Subject: [PATCH] nsi: Add libgcc_s_sjlj-1.dll and libwinpthread-1.dll for MSVC x86 --- dist/windows/strawberry.nsi.in | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dist/windows/strawberry.nsi.in b/dist/windows/strawberry.nsi.in index 59ebac001..2ebc81cdd 100644 --- a/dist/windows/strawberry.nsi.in +++ b/dist/windows/strawberry.nsi.in @@ -489,6 +489,12 @@ Section "Strawberry" Strawberry File "zlibd.dll" !endif + ; Used by libfftw3-3.dll because fftw is compiled with MinGW. +!ifdef arch_x86 + File "libgcc_s_sjlj-1.dll" + File "libwinpthread-1.dll" +!endif + !endif ; MSVC ; Common files @@ -1038,6 +1044,11 @@ Section "Uninstall" Delete "$INSTDIR\zlibd.dll" !endif +!ifdef arch_x86 + Delete "$INSTDIR\libgcc_s_sjlj-1.dll" + Delete "$INSTDIR\libwinpthread-1.dll" +!endif + !endif ; MSVC ; Common files