* modules/gui/skins2/Modules.am: include the default skins2 theme in the "make dist...

* install-win32, Makefile.am: include the default skins2 theme in the win32 package.

diff --git a/Makefile.am b/Makefile.am
index cd74a0d95ae51123eb583887b8b868bb30a80863..f8efc656db38b4bfaa30742a00bbbc0588678054 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -595,6 +595,10 @@ package-win32-base:
        for i in $(srcdir)/doc/skins/*.txt; do \
          cp $$i $(srcdir)/vlc-${VERSION}/skins/ || true ; \
        done
+       mkdir -p $(srcdir)/vlc-${VERSION}/skins2/default
+       for i in $(srcdir)/modules/gui/skins2/theme/*.*; do \
+         cp $$i $(srcdir)/vlc-${VERSION}/skins2/default/ || true ; \
+       done
 
        mkdir -p "$(srcdir)/vlc-${VERSION}/http/admin"
        cp $(srcdir)/share/http/*.html $(srcdir)/vlc-${VERSION}/http/ ;

diff --git a/install-win32 b/install-win32
index dacd516cc4f6b709c5229d8dd76a746013b5bfaf..3a180dca7686b0e7ea51a2a5b90b1a479098fa63 100644 (file)
--- a/install-win32
+++ b/install-win32
@@ -66,6 +66,7 @@ Section "Install"
        File  /r plugins\r
        File  /r locale\r
        File  /r skins\r
+       File  /r skins2\r
        File  /r http\r
        File  /r mozilla\r
 \r

diff --git a/modules/gui/skins2/Modules.am b/modules/gui/skins2/Modules.am
index e3060c2f67b74a8ae6a3b9f2ecdfa3995d5a60bc..7a1520e0a18dad24ba7d0395ce94b17a07aba6ec 100644 (file)
--- a/modules/gui/skins2/Modules.am
+++ b/modules/gui/skins2/Modules.am
@@ -136,14 +136,14 @@ SOURCES_skins2 = \
        utils/var_percent.hpp \
        utils/var_text.cpp \
        utils/var_text.hpp \
-\
+       \
        vars/playlist.cpp \
        vars/playlist.hpp \
        vars/time.cpp \
        vars/time.hpp \
        vars/volume.cpp \
        vars/volume.hpp \
-\
+       \
        win32/win32_dragdrop.cpp \
        win32/win32_dragdrop.hpp \
        win32/win32_factory.cpp \
@@ -176,3 +176,69 @@ SOURCES_skins2 = \
        x11/x11_tooltip.cpp \
        x11/x11_tooltip.hpp \
        $(NULL)
+
+EXTRA_DIST += \
+       theme/add_item_onclick.png \
+       theme/add_item.png \
+       theme/body.png \
+       theme/close_mouseover.png \
+       theme/close_onclick.png \
+       theme/close.png \
+       theme/delete_item_onclick.png \
+       theme/delete_item.png \
+       theme/disabled.png \
+       theme/fast_disabled.png \
+       theme/fast_onclick.png \
+       theme/fast.png \
+       theme/FreeSansBold.ttf \
+       theme/FreeSans.ttf \
+       theme/next_disabled.png \
+       theme/next_onclick.png \
+       theme/next.png \
+       theme/pause_onclick.png \
+       theme/pause.png \
+       theme/playlist_body1.png \
+       theme/playlist_body2.png \
+       theme/playlist_body3.png \
+       theme/playlist_body4.png \
+       theme/playlist_body5.png \
+       theme/playlist_body6.png \
+       theme/playlist_body7.png \
+       theme/playlist_body8.png \
+       theme/playlist_body9.png \
+       theme/playlist_button2.png \
+       theme/playlist_button_onclick2.png \
+       theme/playlist_button_onclick.png \
+       theme/playlist_button.png \
+       theme/playlist.png \
+       theme/play_onclick.png \
+       theme/play.png \
+       theme/preferences_onclick.png \
+       theme/preferences.png \
+       theme/previous_disabled.png \
+       theme/previous_onclick.png \
+       theme/previous.png \
+       theme/reduce_disabled.png \
+       theme/reduce_onclick.png \
+       theme/reduce.png \
+       theme/resize.png \
+       theme/rev_disabled.png \
+       theme/rev_onclick.png \
+       theme/rev.png \
+       theme/skin.dtd \
+       theme/slider2.png \
+       theme/slider_onclick.png \
+       theme/slider_playlist.png \
+       theme/slider.png \
+       theme/slider_volume_onclick.png \
+       theme/slider_volume.png \
+       theme/slow_disabled.png \
+       theme/slow_onclick.png \
+       theme/slow.png \
+       theme/sort_onclick.png \
+       theme/sort.png \
+       theme/stop_disabled.png \
+       theme/stop_onclick.png \
+       theme/stop.png \
+       theme/theme.xml \
+       theme/volume.png