changeset 34794:97ca0ba6ae61

NSIS: Correctly distribute libsodium with the installer (#14422) Commit: https://github.com/vim/vim/commit/19ecb46c55754d31d857688ef0926cda101927d3 Author: Christian Brabandt <cb@256bit.org> Date: Fri Apr 5 19:14:46 2024 +0100 NSIS: Correctly distribute libsodium with the installer (https://github.com/vim/vim/issues/14422) closes: vim/vim-win32-installerhttps://github.com/vim/vim/issues/337 Signed-off-by: Christian Brabandt <cb@256bit.org>
author Christian Brabandt <cb@256bit.org>
date Fri, 05 Apr 2024 20:15:09 +0200
parents 90cec2e1ddc1
children 9ecae383d568
files nsis/gvim.nsi
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/nsis/gvim.nsi
+++ b/nsis/gvim.nsi
@@ -410,6 +410,9 @@ Section "$(str_section_exe)" id_section_
 !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
 	File ${VIMSRC}\vimrun.exe
@@ -429,9 +432,6 @@ Section "$(str_section_exe)" id_section_
 !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\*.*