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

patch 8.1.0418: MS-Windows: cannot separate Lua include and library dirs

Browse Source 
Problem:    MS-Windows: cannot separate Lua include and library directories.
Solution:   Add LUA_LIBDIR and LUA_INCDIR. (Ken Takata, closes #3464)
This commit is contained in:
Bram Moolenaar 2018-09-21 13:44:09 +02:00
parent 036b09ca78
commit b872e63fc6
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Make_cyg_ming.mak
View File

@ -244,6 +244,8 @@ endif
# Lua interface: # Lua interface:
# LUA=[Path to Lua directory] (Set inside Make_cyg.mak or Make_ming.mak) # 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) # DYNAMIC_LUA=yes (to load the Lua DLL dynamically)
# LUA_VER=[Lua version, eg 51, 52] (default is 53) # LUA_VER=[Lua version, eg 51, 52] (default is 53)
ifdef LUA ifdef LUA
@ -256,7 +258,8 @@ LUA_VER=53
endif endif
ifeq (no,$(DYNAMIC_LUA)) ifeq (no,$(DYNAMIC_LUA))
LUA_LIB = -L$(LUA)/lib -llua LUA_LIBDIR = $(LUA)/lib
LUA_LIB = -L$(LUA_LIBDIR) -llua
endif endif
endif endif
@ -524,7 +527,8 @@ endif
endif endif
ifdef LUA 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)) ifeq (yes, $(DYNAMIC_LUA))
CFLAGS += -DDYNAMIC_LUA -DDYNAMIC_LUA_DLL=\"lua$(LUA_VER).dll\" CFLAGS += -DDYNAMIC_LUA -DDYNAMIC_LUA_DLL=\"lua$(LUA_VER).dll\"
endif endif

2
src/version.c
View File

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