Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
Steve Lhomme
VLC
Commits
a6970967
Commit
a6970967
authored
Nov 23, 2005
by
hartman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
merge [13354] to trunk, and use the right .ico in the windows build
parent
51445d03
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
6 deletions
+2
-6
Makefile.am
Makefile.am
+2
-6
No files found.
Makefile.am
View file @
a6970967
...
...
@@ -181,9 +181,6 @@ EXTRA_DIST += \
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/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/a52.icns
\
extras/MacOSX/Resources/aac.icns
\
...
...
@@ -248,7 +245,6 @@ EXTRA_DIST += \
extras/MacOSX/Resources/README
\
extras/MacOSX/vlc.pbproj/project.pbxproj
\
extras/MacOSX/macosx-dmg
\
\
extras/Makefile
\
extras/zsh.cpp
\
$(NULL)
...
...
@@ -883,7 +879,7 @@ package-win32-base:
$(top_builddir)
/vlc-
${VERSION}
/http/vlm/
;
unix2dos
$(top_builddir)
/vlc-
${VERSION}
/http/vlm/
*
.html
;
cp
$(srcdir)/share/vlc48x48
new
.ico
$(top_builddir)/vlc-${VERSION}/
;
cp
$(srcdir)/share/vlc48x48.ico
$(top_builddir)/vlc-${VERSION}/
;
mkdir
-p
"$(top_builddir)/vlc-${VERSION}/mozilla"
if
BUILD_MOZILLA
...
...
@@ -987,7 +983,7 @@ package-wince-base:
$(top_builddir)/vlc-${VERSION}/http/vlm/
;
unix2dos
$(top_builddir)/vlc-${VERSION}/http/vlm/*.html
;
cp
$(srcdir)/share/vlc48x48
new
.ico
$(top_builddir)/vlc-${VERSION}/
;
cp
$(srcdir)/share/vlc48x48.ico
$(top_builddir)/vlc-${VERSION}/
;
if
BUILD_MOZILLA
mkdir
-p
"$(top_builddir)/vlc-${VERSION}/mozilla"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment