summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile4
-rw-r--r--nsis/gvim.nsi1
-rw-r--r--src/version.c2
3 files changed, 6 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 9f48a3509..d19831615 100644
--- a/Makefile
+++ b/Makefile
@@ -120,8 +120,9 @@ MINOR = 0
#
# MS-Windows:
# - Run make on Unix to update the ".mo" files.
-# - Get libintl-8.dll and libiconv-2.dll. E.g. from
+# - Get libintl-8.dll, libiconv-2.dll and libgcc_s_sjlj-1.dll. E.g. from
# https://mlocati.github.io/gettext-iconv-windows/ .
+# Use the "shared-32.zip file and extract the archive to get the files.
# Put them in the top directory, "make dosrt" uses them.
# - > make dossrc
# > make dosrt
@@ -468,6 +469,7 @@ dosrt_files: dist prepare no_title.vim
done
cp libintl-8.dll dist/vim/$(VIMRTDIR)/
cp libiconv-2.dll dist/vim/$(VIMRTDIR)/
+ cp libgcc_s_sjlj-1.dll dist/vim/$(VIMRTDIR)/
# Used before uploading. Don't delete the AAPDIR/sign files!
diff --git a/nsis/gvim.nsi b/nsis/gvim.nsi
index 26d7aab8e..74a54333a 100644
--- a/nsis/gvim.nsi
+++ b/nsis/gvim.nsi
@@ -385,6 +385,7 @@ SectionEnd
File ${VIMRT}\libintl-8.dll
File ${VIMRT}\libiconv-2.dll
File /nonfatal ${VIMRT}\libwinpthread-1.dll
+ File /nonfatal ${VIMRT}\libgcc_s_sjlj-1.dll
SectionEnd
!endif
diff --git a/src/version.c b/src/version.c
index 59ad156c3..1020bf964 100644
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 410,
+/**/
409,
/**/
408,