From a54d2fc0d3ec7c4c8ca99b91e2ff7f7fee45c8bd Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 4 Mar 2017 20:09:34 +0100 Subject: patch 8.0.0410: newer gettext/iconv library has extra dll file Problem: Newer gettext/iconv library has extra dll file. Solution: Add the file to the Makefile and nsis script. (Christian Brabandt) --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Makefile') 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! -- cgit v1.2.1