NSIS: Fix a few issues with gvim.nsi
Commit:
https://github.com/vim/vim/commit/49f1e1979f9c3a4d7b28f0961bca0e41227a0557
Author: RestorerZ <[email protected]>
Date: Tue Apr 9 23:04:44 2024 +0200
NSIS: Fix a few issues with gvim.nsi
- correctly find libsodium.dll
- disable inclusion of libgcc_s_sjlj-1.dll
- generate PATCHLEVEL correctly
related: #14214
closes: #14465
Signed-off-by: RestorerZ <[email protected]>
Signed-off-by: Christian Brabandt <[email protected]>
diff --git a/nsis/gvim.nsi b/nsis/gvim.nsi
index 5574a3334..b8ef079db 100644
--- a/nsis/gvim.nsi
+++ b/nsis/gvim.nsi
@@ -409,9 +409,6 @@ Section "$(str_section_exe)" id_section_exe
File /oname=gvim.exe ${VIMSRC}\gvim_ole.exe
!if /FileExists "${VIMSRC} im${BIT}.dll"
File ${VIMSRC} im${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
@@ -432,6 +429,9 @@ 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
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/E1ruIo4-000uM0-0r%40256bit.org.
