Skip to content

V
vlc-1.1
Commit 829dfded authored by Christophe Mutricy's avatar Christophe Mutricy
Browse files
Options

Fixes related to [3695af46]

parent a1b9a848
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 8 deletions
Makefile.am
View file @ 829dfded
...@@ -113,7 +113,7 @@ EXTRA_DIST += \ ...@@ -113,7 +113,7 @@ EXTRA_DIST += \
extras/package/macosx/Resources/English.lproj/InteractionErrorPanel.nib/classes.nib \ extras/package/macosx/Resources/English.lproj/InteractionErrorPanel.nib/classes.nib \
extras/package/macosx/Resources/English.lproj/InteractionErrorPanel.nib/info.nib \ extras/package/macosx/Resources/English.lproj/InteractionErrorPanel.nib/info.nib \
extras/package/macosx/Resources/English.lproj/InteractionErrorPanel.nib/keyedobjects.nib \ extras/package/macosx/Resources/English.lproj/InteractionErrorPanel.nib/keyedobjects.nib \
extras/package/macosx/Resources/English.lproj/InfoPlist.strings \ extras/package/macosx/Resources/English.lproj/InfoPlist.strings.in \
extras/package/macosx/Resources/a52.icns \ extras/package/macosx/Resources/a52.icns \
extras/package/macosx/Resources/aac.icns \ extras/package/macosx/Resources/aac.icns \
extras/package/macosx/Resources/asf.icns \ extras/package/macosx/Resources/asf.icns \
...@@ -255,11 +255,11 @@ EXTRA_DIST += \ ...@@ -255,11 +255,11 @@ EXTRA_DIST += \
extras/package/macosx/Delete_Preferences.app/Contents/Resources/applet.icns \ extras/package/macosx/Delete_Preferences.app/Contents/Resources/applet.icns \
extras/package/macosx/Delete_Preferences.app/Contents/Resources/applet.rsrc \ extras/package/macosx/Delete_Preferences.app/Contents/Resources/applet.rsrc \
extras/package/macosx/Delete_Preferences.app/Contents/Resources/Scripts/main.scpt \ extras/package/macosx/Delete_Preferences.app/Contents/Resources/Scripts/main.scpt \
extras/package/macosx/plugin/Info.plist \ extras/package/macosx/plugin/Info.plist.in \
extras/package/macosx/plugin/InstallerInfo.plist \ extras/package/macosx/plugin/InstallerInfo.plist.in \
extras/package/macosx/plugin/InstallerDescription.plist \ extras/package/macosx/plugin/InstallerDescription.plist \
extras/package/macosx/plugin/pbdevelopment.plist \ extras/package/macosx/plugin/pbdevelopment.plist \
extras/package/macosx/plugin/English.lproj/InfoPlist.strings \ extras/package/macosx/plugin/English.lproj/InfoPlist.strings.in \
extras/package/macosx/eyetvplugin/EyeTVPluginDefs.h \ extras/package/macosx/eyetvplugin/EyeTVPluginDefs.h \
extras/package/macosx/eyetvplugin/Info.plist \ extras/package/macosx/eyetvplugin/Info.plist \
extras/package/macosx/eyetvplugin/eyetvplugin.c \ extras/package/macosx/eyetvplugin/eyetvplugin.c \
...@@ -267,7 +267,7 @@ EXTRA_DIST += \ ...@@ -267,7 +267,7 @@ EXTRA_DIST += \
extras/package/macosx/eyetvplugin/English.lproj/InfoPlist.strings \ extras/package/macosx/eyetvplugin/English.lproj/InfoPlist.strings \
extras/package/macosx/eyetvplugin/eyetvplugin.xcodeproj/project.pbxproj \ extras/package/macosx/eyetvplugin/eyetvplugin.xcodeproj/project.pbxproj \
extras/package/macosx/README.MacOSX.rtf \ extras/package/macosx/README.MacOSX.rtf \
extras/package/macosx/Info.plist extras/package/macosx/Info.plist.in
############################################################################### ###############################################################################
...@@ -400,9 +400,12 @@ VLC-release.app: vlc ...@@ -400,9 +400,12 @@ VLC-release.app: vlc
rm -Rf "$(top_builddir)/tmp" rm -Rf "$(top_builddir)/tmp"
mkdir -p "$(top_builddir)/tmp/extras/package/macosx" mkdir -p "$(top_builddir)/tmp/extras/package/macosx"
rm -Rf $(top_builddir)/VLC-release.app rm -Rf $(top_builddir)/VLC-release.app
for i in vlc.xcodeproj Resources README.MacOSX.rtf Info.plist; do \ for i in vlc.xcodeproj Resources README.MacOSX.rtf ; do \
cp -R $(srcdir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \ cp -R $(srcdir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \
done done
for i in Resources Info.plist; do \
cp -R $(top_builddir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \
done
for i in AUTHORS COPYING THANKS; do \ for i in AUTHORS COPYING THANKS; do \
cp "$(srcdir)/$$i" $(top_builddir)/tmp; \ cp "$(srcdir)/$$i" $(top_builddir)/tmp; \
done done
...@@ -558,9 +561,12 @@ VLC.app: vlc ...@@ -558,9 +561,12 @@ VLC.app: vlc
rm -Rf $(top_builddir)/tmp rm -Rf $(top_builddir)/tmp
mkdir -p "$(top_builddir)/tmp/extras/package/macosx" mkdir -p "$(top_builddir)/tmp/extras/package/macosx"
rm -Rf $(top_builddir)/VLC.app rm -Rf $(top_builddir)/VLC.app
for i in vlc.xcodeproj Resources README.MacOSX.rtf Info.plist; do \ for i in vlc.xcodeproj Resources README.MacOSX.rtf; do \
cp -R $(srcdir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \ cp -R $(srcdir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \
done done
for i in Resources Info.plist; do \
cp -R $(top_builddir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \
done
for i in AUTHORS COPYING THANKS; do \ for i in AUTHORS COPYING THANKS; do \
cp "$(srcdir)/$$i" $(top_builddir)/tmp; \ cp "$(srcdir)/$$i" $(top_builddir)/tmp; \
done done
......
configure.ac
View file @ 829dfded
...@@ -5797,6 +5797,7 @@ AC_CONFIG_FILES([ ...@@ -5797,6 +5797,7 @@ AC_CONFIG_FILES([
extras/package/macosx/Resources/English.lproj/InfoPlist.strings extras/package/macosx/Resources/English.lproj/InfoPlist.strings
extras/package/macosx/plugin/Info.plist extras/package/macosx/plugin/Info.plist
extras/package/macosx/plugin/InstallerInfo.plist extras/package/macosx/plugin/InstallerInfo.plist
extras/package/macosx/plugin/English.lproj/InfoPlist.strings
Makefile Makefile
projects/activex/Makefile projects/activex/Makefile
projects/activex/axvlc.inf projects/activex/axvlc.inf
......
extras/package/macosx/plugin/English.lproj/InfoPlist.strings → extras/package/macosx/plugin/English.lproj/InfoPlist.strings.in
View file @ 829dfded
B/* Localized versions of Info.plist keys */ B/* Localized versions of Info.plist keys */
......
projects/mozilla/Makefile.am
View file @ 829dfded
...@@ -128,7 +128,8 @@ VLC\ Plugin.plugin: npvlc.rsrc $(lib_LTLIBRARIES) ...@@ -128,7 +128,8 @@ VLC\ Plugin.plugin: npvlc.rsrc $(lib_LTLIBRARIES)
$(INSTALL) -d "$@/Contents/Resources" $(INSTALL) -d "$@/Contents/Resources"
$(INSTALL) npvlc.rsrc "$@/Contents/Resources/VLC Plugin.rsrc" $(INSTALL) npvlc.rsrc "$@/Contents/Resources/VLC Plugin.rsrc"
cp -r "$(top_srcdir)/extras/package/macosx/plugin/English.lproj" "$@/Contents/Resources/" cp -r "$(top_srcdir)/extras/package/macosx/plugin/English.lproj" "$@/Contents/Resources/"
$(INSTALL) "$(top_srcdir)/extras/package/macosx/plugin/Info.plist" "$@/Contents/Info.plist" cp -r "$(top_builddir)/extras/package/macosx/plugin/English.lproj" "$@/Contents/Resources/"
$(INSTALL) "$(top_builddir)/extras/package/macosx/plugin/Info.plist" "$@/Contents/Info.plist"
$(INSTALL) -d "$@/Contents/MacOS/modules" $(INSTALL) -d "$@/Contents/MacOS/modules"
find $(top_srcdir)/modules/ -name '*_plugin.$(LIBEXT)' | \ find $(top_srcdir)/modules/ -name '*_plugin.$(LIBEXT)' | \
while read i; do \ while read i; do \
......
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