Commit 5db54724 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Win32: add a new vlc.ico that supports Vista and Seven guidelines.

parent 25f65d40
......@@ -709,7 +709,7 @@ package-win-common:
unix2dos "$(win32_destdir)/"*.txt || echo "WARNING: this shouldn't happen"
# Necessary icons
cp $(srcdir)/share/vlc48x48.ico $(win32_destdir)/
cp $(srcdir)/share/vlc.ico $(win32_destdir)/
# Copy the locales
mkdir -p $(win32_destdir)/locale
......
......@@ -56,8 +56,8 @@ InstType $Name_InstTypeFull
; MUI Settings
!define MUI_ABORTWARNING
!define MUI_ICON "vlc48x48.ico"
!define MUI_UNICON "vlc48x48.ico"
!define MUI_ICON "vlc.ico"
!define MUI_UNICON "vlc.ico"
!define MUI_COMPONENTSPAGE_SMALLDESC
; Installer pages
......
......@@ -5,6 +5,7 @@ pkgdatadir = $(datadir)/vlc
nobase_dist_data_DATA = applications/vlc.desktop
dist_pkgdata_DATA = \
$(DIST_icons) \
$(DIST_icons16) \
$(DIST_icons32) \
$(DIST_icons48) \
......@@ -79,11 +80,13 @@ DIST_pda = \
pda-rewindb16x16.xpm \
pda-stopb16x16.xpm
DIST_icons = vlc.ico
DIST_icons16 = vlc16x16.png vlc16x16.xpm
DIST_icons32 = vlc32x32.png vlc32x32.xpm vlc32x32-christmas.xpm
DIST_icons48 = vlc48x48.ico vlc48x48.png vlc48x48-christmas.png
DIST_icons48 = vlc48x48.png vlc48x48-christmas.png
DIST_icons128 = vlc128x128.png vlc128x128-christmas.png
......
#define VERSION_NUMBER @VERSION_MAJOR@,@VERSION_MINOR@,@VERSION_REVISION@,@VERSION_EXTRA_RC@
VLC_ICON ICON "vlc48x48.ico"
VLC_ICON ICON "vlc.ico"
1 VERSIONINFO
FILETYPE 1
......
......@@ -28,7 +28,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
IDI_NIOUP ICON DISCARDABLE "vlc48x48.ico"
IDI_NIOUP ICON DISCARDABLE "vlc.ico"
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
......
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