[vlc-commits] contrib: lua: fix luac building on win32

Steve Lhomme git at videolan.org
Sun Aug 21 18:20:35 CEST 2016


vlc | branch: master | Steve Lhomme <robUx4 at videolabs.io> | Wed Aug 10 16:04:15 2016 +0200| [d47562b11ec67df3d7455fa28b7701582b330cf3] | committer: Jean-Baptiste Kempf

contrib: lua: fix luac building on win32

--
replaces https://patches.videolan.org/patch/14255/

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d47562b11ec67df3d7455fa28b7701582b330cf3
---

 contrib/src/lua/rules.mak | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/contrib/src/lua/rules.mak b/contrib/src/lua/rules.mak
index 1524132..11287b4 100644
--- a/contrib/src/lua/rules.mak
+++ b/contrib/src/lua/rules.mak
@@ -85,6 +85,10 @@ endif
 .sum-luac: .sum-lua
 	touch $@
 
+ifdef HAVE_WIN32
+LUACVARS=CPPFLAGS="-DLUA_DL_DLL"
+endif
+
 luac: lua-$(LUA_VERSION).tar.gz .sum-luac
 	# DO NOT use the same intermediate directory as the lua target
 	rm -Rf -- $@-$(LUA_VERSION) $@
@@ -94,7 +98,7 @@ luac: lua-$(LUA_VERSION).tar.gz .sum-luac
 	mv luac-$(LUA_VERSION) luac
 
 .luac: luac
-	cd $< && $(MAKE) generic
+	cd $< && $(LUACVARS) $(MAKE) generic
 	mkdir -p -- $(BUILDBINDIR)
 	install -m 0755 -s -- $</src/luac $(BUILDBINDIR)/$(HOST)-luac
 	touch $@



More information about the vlc-commits mailing list