Mercurial > vim
changeset 14812:7968031aeaa3 v8.1.0418
patch 8.1.0418: MS-Windows: cannot separate Lua include and library dirs
commit https://github.com/vim/vim/commit/b872e63fc6c1955d3a9c33745e29c57f354aa73b
Author: Bram Moolenaar <Bram@vim.org>
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)
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Fri, 21 Sep 2018 13:45:04 +0200 |
parents | ae6532037d29 |
children | 4d2ab393f59a |
files | src/Make_cyg_ming.mak src/version.c |
diffstat | 2 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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