aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-26 04:04:07 -04:00
Code Activity

patch 7.4.1106

Browse Source 
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.
This commit is contained in:
Bram Moolenaar
2016-01-16 18:05:50 +01:00
parent 9bbf63dbf8
commit 286eacd3f6
7 changed files with 29 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/os_win32.c
View File

@@ -463,6 +463,7 @@ vimLoadLib(char *name)
#if defined(DYNAMIC_GETTEXT) || defined(PROTO)
# ifndef GETTEXT_DLL
# define GETTEXT_DLL "libintl.dll"
# define GETTEXT_DLL_ALT "libintl-8.dll"
# endif
/* Dummy functions */
static char *null_libintl_gettext(const char *);
@@ -479,7 +480,7 @@ char *(*dyn_libintl_bind_textdomain_codeset)(const char *, const char *)
= null_libintl_bind_textdomain_codeset;
int
dyn_libintl_init(char *libname)
dyn_libintl_init()
{
int i;
static struct
@@ -498,7 +499,9 @@ dyn_libintl_init(char *libname)
if (hLibintlDLL)
return 1;
/* Load gettext library (libintl.dll) */
hLibintlDLL = vimLoadLib(libname != NULL ? libname : GETTEXT_DLL);
hLibintlDLL = vimLoadLib(GETTEXT_DLL);
if (!hLibintlDLL)
hLibintlDLL = vimLoadLib(GETTEXT_DLL_ALT);
if (!hLibintlDLL)
{
if (p_verbose > 0)