From a3159423f89b7b30ec78346a0b8e03f4b3b096e3 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Fri, 24 Feb 2023 22:09:35 +0100 Subject: [PATCH] nsi: Update libiconv for MSVC --- dist/windows/strawberry.nsi.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dist/windows/strawberry.nsi.in b/dist/windows/strawberry.nsi.in index 02e62ad8..c6e04679 100644 --- a/dist/windows/strawberry.nsi.in +++ b/dist/windows/strawberry.nsi.in @@ -392,7 +392,6 @@ Section "Strawberry" Strawberry File "jpeg62.dll" File "libbs2b.dll" File "libfaac_dll.dll" - File "libiconv.dll" File "liblzma.dll" File "libmp3lame.dll" File "libopenmpt.dll" @@ -417,6 +416,7 @@ Section "Strawberry" Strawberry !ifdef release File "freetype.dll" + File "libiconv.dll" File "libpng16.dll" File "libxml2.dll" File "pcre2-8.dll" @@ -426,6 +426,7 @@ Section "Strawberry" Strawberry !endif !ifdef debug File "freetyped.dll" + File "libiconvd.dll" File "libpng16d.dll" File "libxml2d.dll" File "pcre2-8d.dll" @@ -896,7 +897,6 @@ Section "Uninstall" Delete "$INSTDIR\jpeg62.dll" Delete "$INSTDIR\libbs2b.dll" Delete "$INSTDIR\libfaac_dll.dll" - Delete "$INSTDIR\libiconv.dll" Delete "$INSTDIR\liblzma.dll" Delete "$INSTDIR\libmp3lame.dll" Delete "$INSTDIR\libopenmpt.dll" @@ -921,6 +921,7 @@ Section "Uninstall" !ifdef release Delete "$INSTDIR\freetype.dll" + Delete "$INSTDIR\libiconv.dll" Delete "$INSTDIR\libpng16.dll" Delete "$INSTDIR\libxml2.dll" Delete "$INSTDIR\pcre2-8.dll" @@ -930,6 +931,7 @@ Section "Uninstall" !endif !ifdef debug Delete "$INSTDIR\freetyped.dll" + Delete "$INSTDIR\libiconvd.dll" Delete "$INSTDIR\libpng16d.dll" Delete "$INSTDIR\libxml2d.dll" Delete "$INSTDIR\pcre2-8d.dll"