d0s3t3ch
/
mxe
mirror of https://git.wownero.com/dsc/mxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use official Lua DLL version naming

This commit is contained in:
fiendish 2016-07-27 13:11:06 +02:00
parent 779e4988cd
commit b2fee50a51
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/luarocks/luarocks-1-fixes.patch
View File

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

5
src/lua.mk
View File

@ -6,6 +6,7 @@ $(PKG)_IGNORE :=
$(PKG)_VERSION := 5.3.3 $(PKG)_VERSION := 5.3.3
# Shared version and luarocks subdir # Shared version and luarocks subdir
$(PKG)_SHORTVER := $(call SHORT_PKG_VERSION,$(PKG)) $(PKG)_SHORTVER := $(call SHORT_PKG_VERSION,$(PKG))
$(PKG)_DLLVER := $(subst .,,$($(PKG)_SHORTVER))
$(PKG)_CHECKSUM := 5113c06884f7de453ce57702abaac1d618307f33f6789fa870e87a59d772aca2 $(PKG)_CHECKSUM := 5113c06884f7de453ce57702abaac1d618307f33f6789fa870e87a59d772aca2
$(PKG)_SUBDIR := lua-$($(PKG)_VERSION) $(PKG)_SUBDIR := lua-$($(PKG)_VERSION)
$(PKG)_FILE := lua-$($(PKG)_VERSION).tar.gz $(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' \ AR='$(TARGET)-gcc -Wl,--out-implib,liblua.dll.a -shared -o' \
RANLIB='echo skipped ranlib' \ RANLIB='echo skipped ranlib' \
SYSCFLAGS='-DLUA_BUILD_AS_DLL' \ SYSCFLAGS='-DLUA_BUILD_AS_DLL' \
LUA_A=liblua$($(PKG)_SHORTVER).dll \ LUA_A=lua$($(PKG)_DLLVER).dll \
a lua a lua
$(MAKE) -C '$(1)' -j 1 \ $(MAKE) -C '$(1)' -j 1 \
INSTALL_TOP='$(PREFIX)/$(TARGET)' \ INSTALL_TOP='$(PREFIX)/$(TARGET)' \
INSTALL_MAN='$(1)/noinstall' \ INSTALL_MAN='$(1)/noinstall' \
TO_BIN='liblua$($(PKG)_SHORTVER).dll' \ TO_BIN='lua$($(PKG)_DLLVER).dll' \
INSTALL='$(INSTALL)' \ INSTALL='$(INSTALL)' \
TO_LIB='liblua.dll.a' \ TO_LIB='liblua.dll.a' \
install install