Mercurial > vim
comparison src/Make_cyg_ming.mak @ 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 | 2c72fa16aa70 |
| children | 63b2ee46537f |
comparison
equal
deleted
inserted
replaced
| 14811:ae6532037d29 | 14812:7968031aeaa3 |
|---|---|
| 242 endif | 242 endif |
| 243 endif | 243 endif |
| 244 | 244 |
| 245 # Lua interface: | 245 # Lua interface: |
| 246 # LUA=[Path to Lua directory] (Set inside Make_cyg.mak or Make_ming.mak) | 246 # LUA=[Path to Lua directory] (Set inside Make_cyg.mak or Make_ming.mak) |
| 247 # LUA_LIBDIR=[Path to Lua library directory] (default: $LUA/lib) | |
| 248 # LUA_INCDIR=[Path to Lua include directory] (default: $LUA/include) | |
| 247 # DYNAMIC_LUA=yes (to load the Lua DLL dynamically) | 249 # DYNAMIC_LUA=yes (to load the Lua DLL dynamically) |
| 248 # LUA_VER=[Lua version, eg 51, 52] (default is 53) | 250 # LUA_VER=[Lua version, eg 51, 52] (default is 53) |
| 249 ifdef LUA | 251 ifdef LUA |
| 250 ifndef DYNAMIC_LUA | 252 ifndef DYNAMIC_LUA |
| 251 DYNAMIC_LUA=yes | 253 DYNAMIC_LUA=yes |
| 254 ifndef LUA_VER | 256 ifndef LUA_VER |
| 255 LUA_VER=53 | 257 LUA_VER=53 |
| 256 endif | 258 endif |
| 257 | 259 |
| 258 ifeq (no,$(DYNAMIC_LUA)) | 260 ifeq (no,$(DYNAMIC_LUA)) |
| 259 LUA_LIB = -L$(LUA)/lib -llua | 261 LUA_LIBDIR = $(LUA)/lib |
| 262 LUA_LIB = -L$(LUA_LIBDIR) -llua | |
| 260 endif | 263 endif |
| 261 | 264 |
| 262 endif | 265 endif |
| 263 | 266 |
| 264 # MzScheme interface: | 267 # MzScheme interface: |
| 522 EXTRA_LIBS += -L$(PERLLIBS) -lperl$(PERL_VER) | 525 EXTRA_LIBS += -L$(PERLLIBS) -lperl$(PERL_VER) |
| 523 endif | 526 endif |
| 524 endif | 527 endif |
| 525 | 528 |
| 526 ifdef LUA | 529 ifdef LUA |
| 527 CFLAGS += -I$(LUA)/include -I$(LUA) -DFEAT_LUA | 530 LUA_INCDIR = $(LUA)/include |
| 531 CFLAGS += -I$(LUA_INCDIR) -I$(LUA) -DFEAT_LUA | |
| 528 ifeq (yes, $(DYNAMIC_LUA)) | 532 ifeq (yes, $(DYNAMIC_LUA)) |
| 529 CFLAGS += -DDYNAMIC_LUA -DDYNAMIC_LUA_DLL=\"lua$(LUA_VER).dll\" | 533 CFLAGS += -DDYNAMIC_LUA -DDYNAMIC_LUA_DLL=\"lua$(LUA_VER).dll\" |
| 530 endif | 534 endif |
| 531 endif | 535 endif |
| 532 | 536 |