Mercurial > vim
diff Makefile @ 7613:4456fa2d22e8 v7.4.1106
commit https://github.com/vim/vim/commit/286eacd3f6631e985089176fb1dff1bcf1a1d6b5
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Jan 16 18:05:50 2016 +0100
patch 7.4.1106
Problem: The nsis script can't be used from the appveyor build.
Solution: Add "ifndef" to allow for variables to be set from the command
line. Remove duplicate SetCompressor command. Support using other
gettext binaries. (Ken Takata) Update build instructions to use
libintl-8.dll.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sat, 16 Jan 2016 18:15:05 +0100 |
| parents | 357b7bd8d612 |
| children | 58e749232bd7 |
line wrap: on
line diff
--- a/Makefile +++ b/Makefile @@ -131,6 +131,9 @@ MINOR = 4 # # MS-Windows: # - Run make on Unix to update the ".mo" files. +# - Get libintl-8.dll and libiconv-2.dll. E.g. from +# https://mlocati.github.io/gettext-iconv-windows/ . +# Put them in the top directory, "make dosrt" uses them. # - > make dossrc # > make dosrt # Unpack dist/vim##rt.zip and dist/vim##src.zip on an MS-Windows PC. @@ -493,7 +496,8 @@ dosrt_files: dist prepare no_title.vim cp $$i dist/vim/$(VIMRTDIR)/lang/$$n/LC_MESSAGES/vim.mo; \ fi \ done - cp libintl.dll dist/vim/$(VIMRTDIR)/ + cp libintl-8.dll dist/vim/$(VIMRTDIR)/ + cp libiconv-2.dll dist/vim/$(VIMRTDIR)/ # Used before uploading. Don't delete the AAPDIR/sign files!