Merge pull request #1458 from fiendish/proper_lua_dll_name

Windows Lua DLLs should not start with "lib"
This commit is contained in:
Tony Theodore 2016-08-06 15:41:10 +10:00 committed by GitHub
commit fcbd2fbcc7
2 changed files with 4 additions and 3 deletions

View File

@ -81,7 +81,7 @@ index 1111111..2222222 100644
+ }
+ defaults.runtime_external_deps_patterns = {
+ bin = { "?.exe", "?.bat" },
+ lib = { "?.dll", "lib?.dll" },
+ lib = { "?.dll" },
+ include = { "?.h" }
+ }
+end

View File

@ -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