Skip to content

V
vlc-2-2
Commit a6970967 authored by Derk-Jan Hartman's avatar Derk-Jan Hartman
Browse files
Options

merge [13354] to trunk, and use the right .ico in the windows build

parent 51445d03
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 6 deletions
Makefile.am
View file @ a6970967
...@@ -181,9 +181,6 @@ EXTRA_DIST += \ ...@@ -181,9 +181,6 @@ EXTRA_DIST += \
extras/MacOSX/Resources/English.lproj/Extended.nib/classes.nib \ extras/MacOSX/Resources/English.lproj/Extended.nib/classes.nib \
extras/MacOSX/Resources/English.lproj/Extended.nib/info.nib \ extras/MacOSX/Resources/English.lproj/Extended.nib/info.nib \
extras/MacOSX/Resources/English.lproj/Extended.nib/keyedobjects.nib \ extras/MacOSX/Resources/English.lproj/Extended.nib/keyedobjects.nib \
# extras/MacOSX/Resources/English.lproj/Update.nib/classes.nib \
# extras/MacOSX/Resources/English.lproj/Update.nib/info.nib \
# extras/MacOSX/Resources/English.lproj/Update.nib/keyedobjects.nib \
extras/MacOSX/Resources/English.lproj/InfoPlist.strings \ extras/MacOSX/Resources/English.lproj/InfoPlist.strings \
extras/MacOSX/Resources/a52.icns \ extras/MacOSX/Resources/a52.icns \
extras/MacOSX/Resources/aac.icns \ extras/MacOSX/Resources/aac.icns \
...@@ -248,7 +245,6 @@ EXTRA_DIST += \ ...@@ -248,7 +245,6 @@ EXTRA_DIST += \
extras/MacOSX/Resources/README \ extras/MacOSX/Resources/README \
extras/MacOSX/vlc.pbproj/project.pbxproj \ extras/MacOSX/vlc.pbproj/project.pbxproj \
extras/MacOSX/macosx-dmg \ extras/MacOSX/macosx-dmg \
\
extras/Makefile \ extras/Makefile \
extras/zsh.cpp \ extras/zsh.cpp \
$(NULL) $(NULL)
...@@ -883,7 +879,7 @@ package-win32-base: ...@@ -883,7 +879,7 @@ package-win32-base:
$(top_builddir)/vlc-${VERSION}/http/vlm/ ; $(top_builddir)/vlc-${VERSION}/http/vlm/ ;
unix2dos $(top_builddir)/vlc-${VERSION}/http/vlm/*.html ; unix2dos $(top_builddir)/vlc-${VERSION}/http/vlm/*.html ;
cp $(srcdir)/share/vlc48x48new.ico $(top_builddir)/vlc-${VERSION}/ ; cp $(srcdir)/share/vlc48x48.ico $(top_builddir)/vlc-${VERSION}/ ;
mkdir -p "$(top_builddir)/vlc-${VERSION}/mozilla" mkdir -p "$(top_builddir)/vlc-${VERSION}/mozilla"
if BUILD_MOZILLA if BUILD_MOZILLA
...@@ -987,7 +983,7 @@ package-wince-base: ...@@ -987,7 +983,7 @@ package-wince-base:
$(top_builddir)/vlc-${VERSION}/http/vlm/ ; $(top_builddir)/vlc-${VERSION}/http/vlm/ ;
unix2dos $(top_builddir)/vlc-${VERSION}/http/vlm/*.html ; unix2dos $(top_builddir)/vlc-${VERSION}/http/vlm/*.html ;
cp $(srcdir)/share/vlc48x48new.ico $(top_builddir)/vlc-${VERSION}/ ; cp $(srcdir)/share/vlc48x48.ico $(top_builddir)/vlc-${VERSION}/ ;
if BUILD_MOZILLA if BUILD_MOZILLA
mkdir -p "$(top_builddir)/vlc-${VERSION}/mozilla" mkdir -p "$(top_builddir)/vlc-${VERSION}/mozilla"
......
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