1
0
forked from aniani/vim

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)
This commit is contained in:
Bram Moolenaar 2017-03-04 20:09:34 +01:00
parent 595297d6d5
commit a54d2fc0d3
3 changed files with 6 additions and 1 deletions

View File

@ -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!

View File

@ -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

View File

@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
410,
/**/
409,
/**/