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 7d866ff7c644efc71002171979cde042cda803c6..5574a33347951d985f53108dc0e6c39cdc82b7eb 100644 (file)
--- 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\*.*