Commit 24f3597e authored by Rafaël Carré's avatar Rafaël Carré

Builds correctly lua for windows

Distributes luaplaylist scripts with windows packages
parent 62454ff8
...@@ -729,6 +729,11 @@ package-win32-base-debug: package-win-common ...@@ -729,6 +729,11 @@ package-win32-base-debug: package-win-common
cp $$i $(top_builddir)/vlc-${VERSION}/skins/ || true ; \ cp $$i $(top_builddir)/vlc-${VERSION}/skins/ || true ; \
done done
$(INSTALL) -d $(top_builddir)/vlc-${VERSION}/share/luaplaylist
for i in $(srcdir)/share/luaplaylist/*.* ; do \
$(INSTALL) -m 644 $${i} $(top_builddir)/vlc-${VERSION}/share/luaplaylist/`basename $${i}` ; \
done ; \
mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu" mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu"
cp $(srcdir)/share/osdmenu/*.* "$(top_builddir)/vlc-${VERSION}/osdmenu" cp $(srcdir)/share/osdmenu/*.* "$(top_builddir)/vlc-${VERSION}/osdmenu"
for dir in dvd dvd/selected dvd/unselect dvd/selection dvd/volume default default/selected default/selection default/volume;do \ for dir in dvd dvd/selected dvd/unselect dvd/selection dvd/volume default default/selected default/selection default/volume;do \
......
...@@ -578,7 +578,8 @@ lua: lua-$(LUA_VERSION).tar.gz ...@@ -578,7 +578,8 @@ lua: lua-$(LUA_VERSION).tar.gz
.lua: lua .lua: lua
ifdef HAVE_WIN32 ifdef HAVE_WIN32
( cd $<; sed -i.orig 's/lua luac/lua.exe/' Makefile ; cd src; sed -i.orig 's/CC=/#CC=/' Makefile; cd ../..;) ( cd $<; sed -i.orig 's/lua luac/lua.exe/' Makefile ; cd src; sed -i.orig 's/CC=/#CC=/' Makefile; cd ../..;)
(cd $<; $(HOSTCC) make $(LUA_MAKEPLATEFORM); cd src; $(HOSTCC) make liblua.a; cd ..;$(HOSTCC) make install INSTALL_TOP=$(PREFIX)) (cd $<; $(HOSTCC) make $(LUA_MAKEPLATEFORM); cd src; $(HOSTCC) make liblua.a; cd ..;$(HOSTCC) make install INSTALL_TOP=$(PREFIX); $(RANLIB) $(PREFIX)/lib/liblua.a)
(cd $<; sed -i.orig 's@prefix= /usr/local@prefix= $(PREFIX)@' etc/lua.pc; mkdir -p $(PREFIX)/lib/pkgconfig; cp etc/lua.pc $(PREFIX)/lib/pkgconfig)
else else
(cd $<; $(HOSTCC) make $(LUA_MAKEPLATEFORM) && make install INSTALL_TOP=$(PREFIX)) (cd $<; $(HOSTCC) make $(LUA_MAKEPLATEFORM) && make install INSTALL_TOP=$(PREFIX))
endif endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment