From: Christian Brabandt <cb@256bit.org>
Date: Fri, 5 Apr 2024 18:14:46 +0000 (+0100)
Subject: NSIS: Correctly distribute libsodium with the installer (#14422)
X-Git-Tag: v9.1.0271~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=19ecb46c55754d31d857688ef0926cda101927d3;p=thirdparty%2Fvim.git

NSIS: Correctly distribute libsodium with the installer (#14422)

closes: vim/vim-win32-installer#337

Signed-off-by: Christian Brabandt <cb@256bit.org>
---

diff --git a/nsis/gvim.nsi b/nsis/gvim.nsi
index 7d866ff7c6..5574a33347 100644
--- a/nsis/gvim.nsi
+++ b/nsis/gvim.nsi
@@ -409,6 +409,9 @@ Section "$(str_section_exe)" id_section_exe
 	File /oname=gvim.exe ${VIMSRC}\gvim_ole.exe
 !if /FileExists "${VIMSRC}\vim${BIT}.dll"
 	File ${VIMSRC}\vim${BIT}.dll
+!endif
+!if /FileExists "${VIMRT}\libsodium.dll"
+	File ${VIMRT}\libsodium.dll
 !endif
 	File /oname=install.exe ${VIMSRC}\installw32.exe
 	File /oname=uninstall.exe ${VIMSRC}\uninstallw32.exe
@@ -429,9 +432,6 @@ Section "$(str_section_exe)" id_section_exe
 !if /FileExists "${VIMTOOLS}\winpty-agent.exe"
 	File ${VIMTOOLS}\winpty-agent.exe
 !endif
-!if /FileExists "${VIMTOOLS}\libsodium.dll"
-	File ${VIMTOOLS}\libsodium.dll
-!endif
 
 	SetOutPath $0\colors
 	File /r ${VIMRT}\colors\*.*