# HG changeset patch # User Christian Brabandt # Date 1537530304 -7200 # Node ID 7968031aeaa3d57846cc7b0e6651bce82965970c # Parent ae6532037d297c7e3061526698fcdc8261e31de7 patch 8.1.0418: MS-Windows: cannot separate Lua include and library dirs commit https://github.com/vim/vim/commit/b872e63fc6c1955d3a9c33745e29c57f354aa73b Author: Bram Moolenaar Date: Fri Sep 21 13:44:09 2018 +0200 patch 8.1.0418: MS-Windows: cannot separate Lua include and library dirs Problem: MS-Windows: cannot separate Lua include and library directories. Solution: Add LUA_LIBDIR and LUA_INCDIR. (Ken Takata, closes https://github.com/vim/vim/issues/3464) diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak --- a/src/Make_cyg_ming.mak +++ b/src/Make_cyg_ming.mak @@ -244,6 +244,8 @@ endif # Lua interface: # LUA=[Path to Lua directory] (Set inside Make_cyg.mak or Make_ming.mak) +# LUA_LIBDIR=[Path to Lua library directory] (default: $LUA/lib) +# LUA_INCDIR=[Path to Lua include directory] (default: $LUA/include) # DYNAMIC_LUA=yes (to load the Lua DLL dynamically) # LUA_VER=[Lua version, eg 51, 52] (default is 53) ifdef LUA @@ -256,7 +258,8 @@ LUA_VER=53 endif ifeq (no,$(DYNAMIC_LUA)) -LUA_LIB = -L$(LUA)/lib -llua +LUA_LIBDIR = $(LUA)/lib +LUA_LIB = -L$(LUA_LIBDIR) -llua endif endif @@ -524,7 +527,8 @@ endif endif ifdef LUA -CFLAGS += -I$(LUA)/include -I$(LUA) -DFEAT_LUA +LUA_INCDIR = $(LUA)/include +CFLAGS += -I$(LUA_INCDIR) -I$(LUA) -DFEAT_LUA ifeq (yes, $(DYNAMIC_LUA)) CFLAGS += -DDYNAMIC_LUA -DDYNAMIC_LUA_DLL=\"lua$(LUA_VER).dll\" endif diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -795,6 +795,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 418, +/**/ 417, /**/ 416,