Commit d1b5547c authored by Christophe Mutricy's avatar Christophe Mutricy

Drop the icons resolution from their name

The less acrobatic way
parent 2b727d16
......@@ -735,7 +735,7 @@ package-win-common:
$(U2D) "$(win32_destdir)/"*.txt || echo "WARNING: this shouldn't happen"
# Necessary icons
cp $(srcdir)/share/vlc.ico $(win32_destdir)/
cp $(srcdir)/share/icons/vlc.ico $(win32_destdir)/
# Copy the locales
mkdir -p $(win32_destdir)/locale
......
......@@ -42,8 +42,8 @@
#include <vlc_xlib.h>
#endif
#include "../../../share/vlc32x32.xpm"
#include "../../../share/vlc32x32-christmas.xpm"
#include "../../../share/icons/32x32/vlc.xpm"
#include "../../../share/icons/32x32/vlc-christmas.xpm"
#include <vlc_plugin.h>
#ifdef WIN32 /* For static builds */
......
<RCC>
<qresource prefix="/logo" >
<file alias="vlc128.png" >../../../share/vlc128x128.png</file>
<file alias="vlc16.png" >../../../share/vlc16x16.png</file>
<file alias="vlc48.png" >../../../share/vlc48x48.png</file>
<file alias="vlc128-christmas.png" >../../../share/vlc128x128-christmas.png</file>
<file alias="vlc48-christmas.png" >../../../share/vlc48x48-christmas.png</file>
<file alias="vlc128.png" >../../../share/icons/128x128/vlc.png</file>
<file alias="vlc16.png" >../../../share/icons/16x16/vlc.png</file>
<file alias="vlc48.png" >../../../share/icons/48x48/vlc.png</file>
<file alias="vlc128-christmas.png" >../../../share/icons/128x128/vlc-christmas.png</file>
<file alias="vlc48-christmas.png" >../../../share/icons/48x48/vlc-christmas.png</file>
</qresource>
<qresource prefix="/menu" >
<file alias="help" >pixmaps/menus/help_16px.png</file>
......
......@@ -12,12 +12,13 @@ icons256dir = $(iconsdatadir)/256x256/apps/
dist_appdata_DATA = vlc.desktop
dist_vlcdata_DATA = vlc.ico
dist_icons16_DATA = vlc16x16.png vlc16x16.xpm
dist_icons32_DATA = vlc32x32.png vlc32x32.xpm vlc32x32-christmas.xpm
dist_icons48_DATA = vlc48x48.png vlc48x48-christmas.png
dist_icons128_DATA = vlc128x128.png vlc128x128-christmas.png
dist_icons256_DATA = vlc256x256.png
dist_vlcdata_DATA = icons/vlc.ico
dist_icons16_DATA = icons/16x16/vlc.png icons/16x16/vlc.xpm
dist_icons32_DATA = icons/32x32/vlc.png icons/32x32/vlc.xpm \
icons/32x32/vlc-christmas.xpm
dist_icons48_DATA = icons/48x48/vlc.png icons/48x48/vlc-christmas.png
dist_icons128_DATA = icons/128x128/vlc.png icons/128x128/vlc-christmas.png
dist_icons256_DATA = icons/256x256/vlc.png
nobase_dist_vlcdata_SCRIPTS = \
utils/gnome-vlc-default.sh \
......
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