Commit e837e05e authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Lua Scripts on Windows have to go to scripts/ and not share/lua since no share/ is used on windows.

This doesn't fix it completely yet.
parent 35bb5df5
......@@ -736,8 +736,10 @@ endif
package-win32-base-debug: package-win-common
# Copy relevant files
# Script installer
cp "$(top_builddir)/extras/package/win32/vlc.win32.nsi" "$(top_builddir)/vlc-$(VERSION)/"
# Plugins
mkdir -p "$(top_builddir)/vlc-$(VERSION)/plugins"
for i in "" `$(VLC_CONFIG) --target plugin` ; do \
if test -n "$$i" ; then \
......@@ -745,6 +747,7 @@ package-win32-base-debug: package-win-common
"$(top_builddir)/vlc-$(VERSION)/plugins/" ; \
fi ; done
# Skins
mkdir -p $(top_builddir)/vlc-$(VERSION)/skins/fonts
for i in $(srcdir)/share/skins2/fonts/*.*; do \
cp $$i $(top_builddir)/vlc-$(VERSION)/skins/fonts/ || true ; \
......@@ -753,23 +756,25 @@ package-win32-base-debug: package-win-common
cp $$i $(top_builddir)/vlc-$(VERSION)/skins/ || true ; \
done
$(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/share/lua/playlist
#Lua Scripts
$(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/scripts/playlist
for i in $(srcdir)/share/lua/playlist/*.* ; do \
$(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/share/lua/playlist/`basename $${i}` ; \
$(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/scripts/playlist/`basename $${i}` ; \
done ;
$(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/share/lua/meta
$(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/scripts/meta
for i in $(srcdir)/share/lua/meta/*.* ; do \
$(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/share/lua/meta/`basename $${i}` ; \
$(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/scripts/meta/`basename $${i}` ; \
done ;
$(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/share/lua/intf
$(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/scripts/intf
for i in $(srcdir)/share/lua/intf/*.* ; do \
$(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/share/lua/intf/`basename $${i}` ; \
$(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/scripts/intf/`basename $${i}` ; \
done ;
$(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/share/lua/intf/modules
$(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/scripts/intf/modules
for i in $(srcdir)/share/lua/intf/modules/*.* ; do \
$(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/share/lua/intf/modules/`basename $${i}` ; \
$(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/scripts/intf/modules/`basename $${i}` ; \
done ;
#OSD Menu
mkdir -p "$(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 minimal;do \
......
......@@ -399,8 +399,8 @@ Section "Media player (required)" SEC01
!insertmacro InstallFolder osdmenu
!insertmacro InstallFolder skins
!insertmacro InstallFolder http
!insertmacro InstallFolder share
;!insertmacro InstallFolder scripts
;!insertmacro InstallFolder share
!insertmacro InstallFolder scripts
; URLs
WriteIniStr "$INSTDIR\${PRODUCT_GROUP} Website.url" "InternetShortcut" "URL" \
......
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