summaryrefslogtreecommitdiffstats
path: root/src/lua.mk
diff options
context:
space:
mode:
authorTony Theodore <tonyt@logyst.com>2016-08-06 05:41:10 (GMT)
committerGitHub <noreply@github.com>2016-08-06 05:41:10 (GMT)
commitfcbd2fbcc797dd59ca5c1915ee70da4522b368eb (patch)
tree96e25dfbc4092ae0604393d5405fbc43ae1a7fd5 /src/lua.mk
parenta644700c8cd9246df80200f4c6444c108a8fceee (diff)
parentb2fee50a51fc44b2a5d8ed485dcaae3e8268fb6b (diff)
downloadmxe-fcbd2fbcc797dd59ca5c1915ee70da4522b368eb.zip
mxe-fcbd2fbcc797dd59ca5c1915ee70da4522b368eb.tar.gz
mxe-fcbd2fbcc797dd59ca5c1915ee70da4522b368eb.tar.bz2
Merge pull request #1458 from fiendish/proper_lua_dll_name
Windows Lua DLLs should not start with "lib"
Diffstat (limited to 'src/lua.mk')
-rw-r--r--src/lua.mk5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lua.mk b/src/lua.mk
index 6eed7d0..98c8d5c 100644
--- a/src/lua.mk
+++ b/src/lua.mk
@@ -6,6 +6,7 @@ $(PKG)_IGNORE :=
$(PKG)_VERSION := 5.3.3
# Shared version and luarocks subdir
$(PKG)_SHORTVER := $(call SHORT_PKG_VERSION,$(PKG))
+$(PKG)_DLLVER := $(subst .,,$($(PKG)_SHORTVER))
$(PKG)_CHECKSUM := 5113c06884f7de453ce57702abaac1d618307f33f6789fa870e87a59d772aca2
$(PKG)_SUBDIR := lua-$($(PKG)_VERSION)
$(PKG)_FILE := lua-$($(PKG)_VERSION).tar.gz
@@ -66,12 +67,12 @@ define $(PKG)_BUILD_SHARED
AR='$(TARGET)-gcc -Wl,--out-implib,liblua.dll.a -shared -o' \
RANLIB='echo skipped ranlib' \
SYSCFLAGS='-DLUA_BUILD_AS_DLL' \
- LUA_A=liblua$($(PKG)_SHORTVER).dll \
+ LUA_A=lua$($(PKG)_DLLVER).dll \
a lua
$(MAKE) -C '$(1)' -j 1 \
INSTALL_TOP='$(PREFIX)/$(TARGET)' \
INSTALL_MAN='$(1)/noinstall' \
- TO_BIN='liblua$($(PKG)_SHORTVER).dll' \
+ TO_BIN='lua$($(PKG)_DLLVER).dll' \
INSTALL='$(INSTALL)' \
TO_LIB='liblua.dll.a' \
install