vlc | branch: master | Steve Lhomme <[email protected]> | 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 <[email protected]>

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

_______________________________________________
vlc-commits mailing list
[email protected]
https://mailman.videolan.org/listinfo/vlc-commits

Reply via email to