Skip to content

V
vlc-2-2
Commit 143fd4d8 authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

macosx: basic Sparkle integration 

Shows basic release notes and demonstrates the user experience. Actual updating not yet possible.
parent aeb379ed
Expand all Show whitespace changes
Inline Side-by-side
Showing with 125 additions and 792 deletions
Makefile.am
View file @ 143fd4d8
...@@ -428,6 +428,8 @@ VLC-release.app: vlc ...@@ -428,6 +428,8 @@ VLC-release.app: vlc
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
mkdir -p $(top_builddir)/tmp/extras/contrib/Sparkle
cp -R $(top_srcdir)/extras/contrib/Sparkle/Sparkle.framework $(top_builddir)/tmp/extras/contrib/Sparkle
mkdir -p $(top_builddir)/tmp/modules/audio_output mkdir -p $(top_builddir)/tmp/modules/audio_output
mkdir -p $(top_builddir)/tmp/modules/gui/macosx mkdir -p $(top_builddir)/tmp/modules/gui/macosx
for i in \ for i in \
...@@ -581,6 +583,8 @@ VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.lib ...@@ -581,6 +583,8 @@ VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.lib
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
mkdir -p $(top_builddir)/tmp/extras/contrib/Sparkle
cp -R $(top_srcdir)/extras/contrib/Sparkle/Sparkle.framework $(top_builddir)/tmp/extras/contrib/Sparkle
mkdir -p $(top_builddir)/tmp/modules/audio_output mkdir -p $(top_builddir)/tmp/modules/audio_output
mkdir -p $(top_builddir)/tmp/modules/gui/macosx mkdir -p $(top_builddir)/tmp/modules/gui/macosx
for i in \ for i in \
......
configure.ac
View file @ 143fd4d8
...@@ -5064,6 +5064,7 @@ then ...@@ -5064,6 +5064,7 @@ then
VLC_ADD_LDFLAGS([macosx minimal_macosx], [-Wl,-framework,CoreServices]) VLC_ADD_LDFLAGS([macosx minimal_macosx], [-Wl,-framework,CoreServices])
VLC_ADD_LDFLAGS([macosx minimal_macosx], [-Wl,-framework,AGL]) VLC_ADD_LDFLAGS([macosx minimal_macosx], [-Wl,-framework,AGL])
VLC_ADD_LDFLAGS([macosx], [-Wl,-framework,IOKit]) VLC_ADD_LDFLAGS([macosx], [-Wl,-framework,IOKit])
VLC_ADD_LDFLAGS([macosx], [-F\\\${top_srcdir}/extras/contrib/Sparkle -Wl,-framework,Sparkle])
dnl For bug report dnl For bug report
VLC_ADD_LDFLAGS([macosx], [-Wl,-framework,AddressBook]) VLC_ADD_LDFLAGS([macosx], [-Wl,-framework,AddressBook])
VLC_ADD_LDFLAGS([macosx qtcapture], [-Wl,-framework,QTKit]) VLC_ADD_LDFLAGS([macosx qtcapture], [-Wl,-framework,QTKit])
......
extras/contrib/src/Distributions/darwin.mak
View file @ 143fd4d8
...@@ -6,7 +6,7 @@ all: .autoconf .gnumake .automake .libtool .intl .pkgcfg .yasm .freetype \ ...@@ -6,7 +6,7 @@ all: .autoconf .gnumake .automake .libtool .intl .pkgcfg .yasm .freetype \
.png .gpg-error .gcrypt .gnutls .cddb .cdio .vcdimager \ .png .gpg-error .gcrypt .gnutls .cddb .cdio .vcdimager \
.SDL_image .glib .gecko .mpcdec .dirac_encoder .dirac_decoder \ .SDL_image .glib .gecko .mpcdec .dirac_encoder .dirac_decoder \
.dca .tag .x264 .goom2k4 .lua .zvbi .fontconfig .ncurses .liboil \ .dca .tag .x264 .goom2k4 .lua .zvbi .fontconfig .ncurses .liboil \
.schroedinger .libass .libupnp .kate .aclocal .schroedinger .libass .libupnp .kate .Sparkle .aclocal
# .expat .clinkcc don't work with SDK yet # .expat .clinkcc don't work with SDK yet
# .glib .IDL .gecko are required to build the mozilla plugin # .glib .IDL .gecko are required to build the mozilla plugin
# .mozilla-macosx will build an entire mozilla. it can be used if we need to create a new .gecko package # .mozilla-macosx will build an entire mozilla. it can be used if we need to create a new .gecko package
......
extras/contrib/src/Makefile
View file @ 143fd4d8
...@@ -2507,6 +2507,29 @@ CLEAN_FILE += .libass ...@@ -2507,6 +2507,29 @@ CLEAN_FILE += .libass
CLEAN_PKG += libass CLEAN_PKG += libass
DISTCLEAN_PKG += libass-$(ASS_VERSION).tar.bz2 DISTCLEAN_PKG += libass-$(ASS_VERSION).tar.bz2
# ***************************************************************************
# Sparkle
# ***************************************************************************
"Sparkle\ $(SPARKLE_VERSION).zip":
$(WGET) $(SPARKLE_URL)
Sparkle: "Sparkle\ $(SPARKLE_VERSION).zip"
rm -rf $@ || true
unzip $<
touch $@
.Sparkle: Sparkle
rm -rf ../Sparkle
mv Sparkle ..
mkdir Sparkle
(cd $<)
touch $@
CLEAN_FILE += .Sparkle
CLEAN_PKG += Sparkle
DISTCLEAN_PKG += Sparkle%20$(SPARKLE_VERSION).zip
# *************************************************************************** # ***************************************************************************
# UPNP library # UPNP library
# *************************************************************************** # ***************************************************************************
......
extras/contrib/src/packages.mak
View file @ 143fd4d8
...@@ -229,3 +229,6 @@ ASS_URL=$(SF)/libass/libass-$(ASS_VERSION).tar.bz2 ...@@ -229,3 +229,6 @@ ASS_URL=$(SF)/libass/libass-$(ASS_VERSION).tar.bz2
ASS_GIT=git://greg.geekmind.org/libass.git ASS_GIT=git://greg.geekmind.org/libass.git
GSM_VERSION=1.0.12 GSM_VERSION=1.0.12
GSM_URL=http://user.cs.tu-berlin.de/~jutta/gsm/gsm-$(GSM_VERSION).tar.gz GSM_URL=http://user.cs.tu-berlin.de/~jutta/gsm/gsm-$(GSM_VERSION).tar.gz
SPARKLE_VERSION=1.5b6-vlc
#SPARKLE_URL=http://sparkle.andymatuschak.org/files/Sparkle%20$(SPARKLE_VERSION).zip
SPARKLE_URL=$(VIDEOLAN)/testing/contrib/Sparkle%20$(SPARKLE_VERSION).zip
extras/package/macosx/Info.plist.in
View file @ 143fd4d8
...@@ -1019,6 +1019,8 @@ ...@@ -1019,6 +1019,8 @@
<string>Binary</string> <string>Binary</string>
</dict> </dict>
</array> </array>
<key>SUFeedURL</key>
<string>http://jones.videolan.org/~videolan/fpk/sparkle/vlc.xml</string>
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
<string>VLC</string> <string>VLC</string>
<key>CFBundleGetInfoString</key> <key>CFBundleGetInfoString</key>
......
extras/package/macosx/Resources/English.lproj/MainMenu.nib/designable.nib
View file @ 143fd4d8
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.03"> <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.03">
<data> <data>
<int key="IBDocument.SystemTarget">1050</int> <int key="IBDocument.SystemTarget">1050</int>
<string key="IBDocument.SystemVersion">9L25</string> <string key="IBDocument.SystemVersion">9L27</string>
<string key="IBDocument.InterfaceBuilderVersion">677</string> <string key="IBDocument.InterfaceBuilderVersion">677</string>
<string key="IBDocument.AppKitVersion">949.54</string> <string key="IBDocument.AppKitVersion">949.54</string>
<string key="IBDocument.HIToolboxVersion">353.00</string> <string key="IBDocument.HIToolboxVersion">353.00</string>
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
<integer value="2199"/> <integer value="2199"/>
<integer value="3568"/> <integer value="3568"/>
<integer value="4375"/> <integer value="4375"/>
<integer value="2457"/>
<integer value="283"/> <integer value="283"/>
<integer value="29"/>
</object> </object>
<object class="NSArray" key="IBDocument.PluginDependencies"> <object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
...@@ -1724,7 +1724,7 @@ ...@@ -1724,7 +1724,7 @@
<string>WebURLsWithTitlesPboardType</string> <string>WebURLsWithTitlesPboardType</string>
</object> </object>
</object> </object>
<string key="NSFrameSize">{597, 15}</string> <string key="NSFrameSize">{597, 14}</string>
<reference key="NSSuperview" ref="341241234"/> <reference key="NSSuperview" ref="341241234"/>
<object class="NSTextContainer" key="NSTextContainer" id="748594020"> <object class="NSTextContainer" key="NSTextContainer" id="748594020">
<object class="NSLayoutManager" key="NSLayoutManager"> <object class="NSLayoutManager" key="NSLayoutManager">
...@@ -1804,7 +1804,7 @@ ...@@ -1804,7 +1804,7 @@
<nil key="NSDefaultParagraphStyle"/> <nil key="NSDefaultParagraphStyle"/>
</object> </object>
<int key="NSTVFlags">6</int> <int key="NSTVFlags">6</int>
<string key="NSMaxSize">{1116, 1e+07}</string> <string key="NSMaxSize">{1196, 1e+07}</string>
<string key="NSMinize">{114, 0}</string> <string key="NSMinize">{114, 0}</string>
<nil key="NSDelegate"/> <nil key="NSDelegate"/>
</object> </object>
...@@ -5675,6 +5675,9 @@ LCAuLi4</string> ...@@ -5675,6 +5675,9 @@ LCAuLi4</string>
<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string> <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
<string key="NSFrameAutosaveName">embeddedvoutwindow</string> <string key="NSFrameAutosaveName">embeddedvoutwindow</string>
</object> </object>
<object class="NSCustomObject" id="724363397">
<string key="NSClassName">SUUpdater</string>
</object>
</object> </object>
<object class="IBObjectContainer" key="IBDocument.Objects"> <object class="IBObjectContainer" key="IBDocument.Objects">
<object class="NSMutableArray" key="connectionRecords"> <object class="NSMutableArray" key="connectionRecords">
...@@ -7455,14 +7458,6 @@ LCAuLi4</string> ...@@ -7455,14 +7458,6 @@ LCAuLi4</string>
</object> </object>
<int key="connectionID">2458</int> <int key="connectionID">2458</int>
</object> </object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">checkForUpdate:</string>
<reference key="source" ref="382099807"/>
<reference key="destination" ref="93213564"/>
</object>
<int key="connectionID">2459</int>
</object>
<object class="IBConnectionRecord"> <object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection"> <object class="IBActionConnection" key="connection">
<string key="label">takeIntValueFrom:</string> <string key="label">takeIntValueFrom:</string>
...@@ -9135,6 +9130,14 @@ LCAuLi4</string> ...@@ -9135,6 +9130,14 @@ LCAuLi4</string>
</object> </object>
<int key="connectionID">4532</int> <int key="connectionID">4532</int>
</object> </object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">checkForUpdates:</string>
<reference key="source" ref="724363397"/>
<reference key="destination" ref="93213564"/>
</object>
<int key="connectionID">4534</int>
</object>
</object> </object>
<object class="IBMutableOrderedSet" key="objectRecords"> <object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects"> <object class="NSArray" key="orderedObjects">
...@@ -12672,6 +12675,12 @@ LCAuLi4</string> ...@@ -12672,6 +12675,12 @@ LCAuLi4</string>
<reference key="object" ref="165982631"/> <reference key="object" ref="165982631"/>
<reference key="parent" ref="323070352"/> <reference key="parent" ref="323070352"/>
</object> </object>
<object class="IBObjectRecord">
<int key="objectID">4533</int>
<reference key="object" ref="724363397"/>
<reference key="parent" ref="0"/>
<string key="objectName">Sparkle Updater</string>
</object>
</object> </object>
</object> </object>
<object class="NSMutableDictionary" key="flattenedProperties"> <object class="NSMutableDictionary" key="flattenedProperties">
...@@ -13542,6 +13551,7 @@ LCAuLi4</string> ...@@ -13542,6 +13551,7 @@ LCAuLi4</string>
<string>4445.IBPluginDependency</string> <string>4445.IBPluginDependency</string>
<string>446.IBPluginDependency</string> <string>446.IBPluginDependency</string>
<string>446.ImportedFromIB2</string> <string>446.ImportedFromIB2</string>
<string>4533.IBPluginDependency</string>
<string>5.IBPluginDependency</string> <string>5.IBPluginDependency</string>
<string>5.ImportedFromIB2</string> <string>5.ImportedFromIB2</string>
<string>56.IBPluginDependency</string> <string>56.IBPluginDependency</string>
...@@ -14101,7 +14111,7 @@ LCAuLi4</string> ...@@ -14101,7 +14111,7 @@ LCAuLi4</string>
<reference ref="5"/> <reference ref="5"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="5"/> <reference ref="5"/>
<string>{{69, 713}, {308, 43}}</string> <string>{{343, 713}, {308, 43}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="5"/> <reference ref="5"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
...@@ -14456,6 +14466,7 @@ LCAuLi4</string> ...@@ -14456,6 +14466,7 @@ LCAuLi4</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="5"/> <reference ref="5"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="5"/> <reference ref="5"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="5"/> <reference ref="5"/>
...@@ -14463,7 +14474,7 @@ LCAuLi4</string> ...@@ -14463,7 +14474,7 @@ LCAuLi4</string>
<reference ref="5"/> <reference ref="5"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="5"/> <reference ref="5"/>
<string>{{82, 199}, {270, 233}}</string> <string>{{355, 449}, {270, 233}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="5"/> <reference ref="5"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
...@@ -14523,7 +14534,7 @@ LCAuLi4</string> ...@@ -14523,7 +14534,7 @@ LCAuLi4</string>
</object> </object>
</object> </object>
<nil key="sourceID"/> <nil key="sourceID"/>
<int key="maxID">4532</int> <int key="maxID">4534</int>
</object> </object>
<object class="IBClassDescriber" key="IBDocument.Classes"> <object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions"> <object class="NSMutableArray" key="referencedPartialClassDescriptions">
...@@ -15829,6 +15840,36 @@ LCAuLi4</string> ...@@ -15829,6 +15840,36 @@ LCAuLi4</string>
<reference key="sourceIdentifier" ref="589545472"/> <reference key="sourceIdentifier" ref="589545472"/>
</object> </object>
</object> </object>
<object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.1+">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBDocumentRelativeSource</string>
<string key="minorKey">../../../../contrib/Sparkle/Sparkle.framework/Versions/A/Headers/SUAppcast.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="183179419">
<string key="majorKey">IBDocumentRelativeSource</string>
<string key="minorKey">../../../../contrib/Sparkle/Sparkle.framework/Versions/A/Headers/SUUpdater.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">SUUpdater</string>
<string key="superclassName">NSObject</string>
<object class="NSMutableDictionary" key="actions">
<string key="NS.key.0">checkForUpdates:</string>
<string key="NS.object.0">id</string>
</object>
<object class="NSMutableDictionary" key="outlets">
<string key="NS.key.0">delegate</string>
<string key="NS.object.0">id</string>
</object>
<reference key="sourceIdentifier" ref="183179419"/>
</object>
</object>
</object> </object>
<int key="IBDocument.localizationMode">0</int> <int key="IBDocument.localizationMode">0</int>
<string key="IBDocument.LastKnownRelativeProjectPath">../../vlc.xcodeproj</string> <string key="IBDocument.LastKnownRelativeProjectPath">../../vlc.xcodeproj</string>
......
extras/package/macosx/vlc.xcodeproj/project.pbxproj
View file @ 143fd4d8
...@@ -65,7 +65,6 @@ ...@@ -65,7 +65,6 @@
CC402EFA0E00ABBB006A4BA4 /* play_embedded_blue.png in Resources */ = {isa = PBXBuildFile; fileRef = C2F2A703095AE51600018C74 /* play_embedded_blue.png */; }; CC402EFA0E00ABBB006A4BA4 /* play_embedded_blue.png in Resources */ = {isa = PBXBuildFile; fileRef = C2F2A703095AE51600018C74 /* play_embedded_blue.png */; };
CC402EFB0E00ABBB006A4BA4 /* skip_forward_embedded_blue.png in Resources */ = {isa = PBXBuildFile; fileRef = C2F2A704095AE51600018C74 /* skip_forward_embedded_blue.png */; }; CC402EFB0E00ABBB006A4BA4 /* skip_forward_embedded_blue.png in Resources */ = {isa = PBXBuildFile; fileRef = C2F2A704095AE51600018C74 /* skip_forward_embedded_blue.png */; };
CC402EFC0E00ABBB006A4BA4 /* skip_previous_embedded_blue.png in Resources */ = {isa = PBXBuildFile; fileRef = C2F2A705095AE51600018C74 /* skip_previous_embedded_blue.png */; }; CC402EFC0E00ABBB006A4BA4 /* skip_previous_embedded_blue.png in Resources */ = {isa = PBXBuildFile; fileRef = C2F2A705095AE51600018C74 /* skip_previous_embedded_blue.png */; };
CC402EFD0E00ABBB006A4BA4 /* Update.nib in Resources */ = {isa = PBXBuildFile; fileRef = CC26BF2A09A7A05000E94D62 /* Update.nib */; };
CC402F000E00ABBB006A4BA4 /* add_embedded_blue.png in Resources */ = {isa = PBXBuildFile; fileRef = CC4ED9AC0ABE07C800CA4CC5 /* add_embedded_blue.png */; }; CC402F000E00ABBB006A4BA4 /* add_embedded_blue.png in Resources */ = {isa = PBXBuildFile; fileRef = CC4ED9AC0ABE07C800CA4CC5 /* add_embedded_blue.png */; };
CC402F010E00ABBB006A4BA4 /* add_embedded.png in Resources */ = {isa = PBXBuildFile; fileRef = CC4ED9AD0ABE07C800CA4CC5 /* add_embedded.png */; }; CC402F010E00ABBB006A4BA4 /* add_embedded.png in Resources */ = {isa = PBXBuildFile; fileRef = CC4ED9AD0ABE07C800CA4CC5 /* add_embedded.png */; };
CC402F020E00ABBB006A4BA4 /* repeat_embedded_blue.png in Resources */ = {isa = PBXBuildFile; fileRef = CC4ED9AE0ABE07C800CA4CC5 /* repeat_embedded_blue.png */; }; CC402F020E00ABBB006A4BA4 /* repeat_embedded_blue.png in Resources */ = {isa = PBXBuildFile; fileRef = CC4ED9AE0ABE07C800CA4CC5 /* repeat_embedded_blue.png */; };
...@@ -134,6 +133,8 @@ ...@@ -134,6 +133,8 @@
CC402F420E00ABBB006A4BA4 /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CC3DC89B0A7CDB9600B53F32 /* ApplicationServices.framework */; }; CC402F420E00ABBB006A4BA4 /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CC3DC89B0A7CDB9600B53F32 /* ApplicationServices.framework */; };
CC402F430E00ABBB006A4BA4 /* QTKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CC1941240B9C1F8400635F6B /* QTKit.framework */; }; CC402F430E00ABBB006A4BA4 /* QTKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CC1941240B9C1F8400635F6B /* QTKit.framework */; };
CC402F440E00ABBB006A4BA4 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CC962E2C0CC7992800A56695 /* WebKit.framework */; }; CC402F440E00ABBB006A4BA4 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CC962E2C0CC7992800A56695 /* WebKit.framework */; };
CC426FD11020D44F00A32659 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CC426FD01020D44F00A32659 /* Sparkle.framework */; };
CC426FD71020D47100A32659 /* Sparkle.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = CC426FD01020D44F00A32659 /* Sparkle.framework */; };
CC62B8D00FC5787D0077BB8C /* aiff.icns in Resources */ = {isa = PBXBuildFile; fileRef = CC62B8C50FC5787D0077BB8C /* aiff.icns */; }; CC62B8D00FC5787D0077BB8C /* aiff.icns in Resources */ = {isa = PBXBuildFile; fileRef = CC62B8C50FC5787D0077BB8C /* aiff.icns */; };
CC62B8D10FC5787D0077BB8C /* audio.icns in Resources */ = {isa = PBXBuildFile; fileRef = CC62B8C60FC5787D0077BB8C /* audio.icns */; }; CC62B8D10FC5787D0077BB8C /* audio.icns in Resources */ = {isa = PBXBuildFile; fileRef = CC62B8C60FC5787D0077BB8C /* audio.icns */; };
CC62B8D20FC5787D0077BB8C /* flv.icns in Resources */ = {isa = PBXBuildFile; fileRef = CC62B8C70FC5787D0077BB8C /* flv.icns */; }; CC62B8D20FC5787D0077BB8C /* flv.icns in Resources */ = {isa = PBXBuildFile; fileRef = CC62B8C70FC5787D0077BB8C /* flv.icns */; };
...@@ -175,6 +176,20 @@ ...@@ -175,6 +176,20 @@
CCF11B540F8BFB520088542D /* ErrorPanel.nib in Resources */ = {isa = PBXBuildFile; fileRef = CCF11B520F8BFB520088542D /* ErrorPanel.nib */; }; CCF11B540F8BFB520088542D /* ErrorPanel.nib in Resources */ = {isa = PBXBuildFile; fileRef = CCF11B520F8BFB520088542D /* ErrorPanel.nib */; };
/* End PBXBuildFile section */ /* End PBXBuildFile section */
/* Begin PBXCopyFilesBuildPhase section */
CC426FD81020D48700A32659 /* Copy Frameworks */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "";
dstSubfolderSpec = 10;
files = (
CC426FD71020D47100A32659 /* Sparkle.framework in Copy Frameworks */,
);
name = "Copy Frameworks";
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */ /* Begin PBXFileReference section */
089C1672FE841209C02AAC07 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; }; 089C1672FE841209C02AAC07 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
089C167FFE841241C02AAC07 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; }; 089C167FFE841241C02AAC07 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
...@@ -263,7 +278,6 @@ ...@@ -263,7 +278,6 @@
CC0FB34B0F8BED1100F057F7 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = Resources/English.lproj/CoreDialogs.nib; sourceTree = "<group>"; }; CC0FB34B0F8BED1100F057F7 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = Resources/English.lproj/CoreDialogs.nib; sourceTree = "<group>"; };
CC1941240B9C1F8400635F6B /* QTKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QTKit.framework; path = /System/Library/Frameworks/QTKit.framework; sourceTree = "<absolute>"; }; CC1941240B9C1F8400635F6B /* QTKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QTKit.framework; path = /System/Library/Frameworks/QTKit.framework; sourceTree = "<absolute>"; };
CC1C41D00D9BAD7F002728FA /* noart.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = noart.png; path = Resources/noart.png; sourceTree = "<group>"; }; CC1C41D00D9BAD7F002728FA /* noart.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = noart.png; path = Resources/noart.png; sourceTree = "<group>"; };
CC26BF2B09A7A05000E94D62 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = Resources/English.lproj/Update.nib; sourceTree = "<group>"; };
CC26BF3109A7A08C00E94D62 /* update.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = update.h; path = ../../../modules/gui/macosx/update.h; sourceTree = SOURCE_ROOT; }; CC26BF3109A7A08C00E94D62 /* update.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = update.h; path = ../../../modules/gui/macosx/update.h; sourceTree = SOURCE_ROOT; };
CC26BF3209A7A08C00E94D62 /* update.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = update.m; path = ../../../modules/gui/macosx/update.m; sourceTree = SOURCE_ROOT; }; CC26BF3209A7A08C00E94D62 /* update.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = update.m; path = ../../../modules/gui/macosx/update.m; sourceTree = SOURCE_ROOT; };
CC33C2200D2572DE008C4683 /* pause_embedded_graphite.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = pause_embedded_graphite.png; path = Resources/pause_embedded_graphite.png; sourceTree = "<group>"; }; CC33C2200D2572DE008C4683 /* pause_embedded_graphite.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = pause_embedded_graphite.png; path = Resources/pause_embedded_graphite.png; sourceTree = "<group>"; };
...@@ -287,6 +301,7 @@ ...@@ -287,6 +301,7 @@
CC33C2500D2578F5008C4683 /* fullscreen_graphite.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = fullscreen_graphite.png; path = Resources/fullscreen_graphite.png; sourceTree = "<group>"; }; CC33C2500D2578F5008C4683 /* fullscreen_graphite.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = fullscreen_graphite.png; path = Resources/fullscreen_graphite.png; sourceTree = "<group>"; };
CC3DC89B0A7CDB9600B53F32 /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = /System/Library/Frameworks/ApplicationServices.framework; sourceTree = "<absolute>"; }; CC3DC89B0A7CDB9600B53F32 /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = /System/Library/Frameworks/ApplicationServices.framework; sourceTree = "<absolute>"; };
CC402F4B0E00ABBB006A4BA4 /* VLC.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = VLC.bundle; sourceTree = BUILT_PRODUCTS_DIR; }; CC402F4B0E00ABBB006A4BA4 /* VLC.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = VLC.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
CC426FD01020D44F00A32659 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = ../../contrib/Sparkle/Sparkle.framework; sourceTree = SOURCE_ROOT; };
CC4A33210F8CB017000FC4A7 /* coredialogs.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = coredialogs.m; path = ../../../modules/gui/macosx/coredialogs.m; sourceTree = SOURCE_ROOT; }; CC4A33210F8CB017000FC4A7 /* coredialogs.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = coredialogs.m; path = ../../../modules/gui/macosx/coredialogs.m; sourceTree = SOURCE_ROOT; };
CC4A33220F8CB017000FC4A7 /* coredialogs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = coredialogs.h; path = ../../../modules/gui/macosx/coredialogs.h; sourceTree = SOURCE_ROOT; }; CC4A33220F8CB017000FC4A7 /* coredialogs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = coredialogs.h; path = ../../../modules/gui/macosx/coredialogs.h; sourceTree = SOURCE_ROOT; };
CC4ED9AC0ABE07C800CA4CC5 /* add_embedded_blue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = add_embedded_blue.png; path = Resources/add_embedded_blue.png; sourceTree = "<group>"; }; CC4ED9AC0ABE07C800CA4CC5 /* add_embedded_blue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = add_embedded_blue.png; path = Resources/add_embedded_blue.png; sourceTree = "<group>"; };
...@@ -428,6 +443,7 @@ ...@@ -428,6 +443,7 @@
CC402F430E00ABBB006A4BA4 /* QTKit.framework in Frameworks */, CC402F430E00ABBB006A4BA4 /* QTKit.framework in Frameworks */,
CC402F440E00ABBB006A4BA4 /* WebKit.framework in Frameworks */, CC402F440E00ABBB006A4BA4 /* WebKit.framework in Frameworks */,
CCBE999F0F922C51000705F8 /* CoreServices.framework in Frameworks */, CCBE999F0F922C51000705F8 /* CoreServices.framework in Frameworks */,
CC426FD11020D44F00A32659 /* Sparkle.framework in Frameworks */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
...@@ -539,6 +555,7 @@ ...@@ -539,6 +555,7 @@
1058C7ACFEA557BF11CA2CBB /* Linked Frameworks */ = { 1058C7ACFEA557BF11CA2CBB /* Linked Frameworks */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
CC426FD01020D44F00A32659 /* Sparkle.framework */,
CCBE999E0F922C51000705F8 /* CoreServices.framework */, CCBE999E0F922C51000705F8 /* CoreServices.framework */,
CC962E2C0CC7992800A56695 /* WebKit.framework */, CC962E2C0CC7992800A56695 /* WebKit.framework */,
CC1941240B9C1F8400635F6B /* QTKit.framework */, CC1941240B9C1F8400635F6B /* QTKit.framework */,
...@@ -828,7 +845,6 @@ ...@@ -828,7 +845,6 @@
DCFCCDB7085CE18F001E36AF /* Wizard.nib */, DCFCCDB7085CE18F001E36AF /* Wizard.nib */,
DC7F46EB08A183FC0027DB24 /* Extended.nib */, DC7F46EB08A183FC0027DB24 /* Extended.nib */,
DCE7BD0308A56C8B007B10AE /* Bookmarks.nib */, DCE7BD0308A56C8B007B10AE /* Bookmarks.nib */,
CC26BF2A09A7A05000E94D62 /* Update.nib */,
); );
name = nibs; name = nibs;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -843,6 +859,7 @@ ...@@ -843,6 +859,7 @@
CC402EAF0E00ABBB006A4BA4 /* Resources */, CC402EAF0E00ABBB006A4BA4 /* Resources */,
CC402F400E00ABBB006A4BA4 /* Frameworks */, CC402F400E00ABBB006A4BA4 /* Frameworks */,
CC402F450E00ABBB006A4BA4 /* Rez */, CC402F450E00ABBB006A4BA4 /* Rez */,
CC426FD81020D48700A32659 /* Copy Frameworks */,
); );
buildRules = ( buildRules = (
); );
...@@ -966,7 +983,6 @@ ...@@ -966,7 +983,6 @@
CC402EFA0E00ABBB006A4BA4 /* play_embedded_blue.png in Resources */, CC402EFA0E00ABBB006A4BA4 /* play_embedded_blue.png in Resources */,
CC402EFB0E00ABBB006A4BA4 /* skip_forward_embedded_blue.png in Resources */, CC402EFB0E00ABBB006A4BA4 /* skip_forward_embedded_blue.png in Resources */,
CC402EFC0E00ABBB006A4BA4 /* skip_previous_embedded_blue.png in Resources */, CC402EFC0E00ABBB006A4BA4 /* skip_previous_embedded_blue.png in Resources */,
CC402EFD0E00ABBB006A4BA4 /* Update.nib in Resources */,
CC402F000E00ABBB006A4BA4 /* add_embedded_blue.png in Resources */, CC402F000E00ABBB006A4BA4 /* add_embedded_blue.png in Resources */,
CC402F010E00ABBB006A4BA4 /* add_embedded.png in Resources */, CC402F010E00ABBB006A4BA4 /* add_embedded.png in Resources */,
CC402F020E00ABBB006A4BA4 /* repeat_embedded_blue.png in Resources */, CC402F020E00ABBB006A4BA4 /* repeat_embedded_blue.png in Resources */,
...@@ -1061,14 +1077,6 @@ ...@@ -1061,14 +1077,6 @@
name = CoreDialogs.nib; name = CoreDialogs.nib;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
CC26BF2A09A7A05000E94D62 /* Update.nib */ = {
isa = PBXVariantGroup;
children = (
CC26BF2B09A7A05000E94D62 /* English */,
);
name = Update.nib;
sourceTree = "<group>";
};
CCB60A400E6E5E3F00407004 /* VLM.nib */ = { CCB60A400E6E5E3F00407004 /* VLM.nib */ = {
isa = PBXVariantGroup; isa = PBXVariantGroup;
children = ( children = (
...@@ -1182,7 +1190,11 @@ ...@@ -1182,7 +1190,11 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
FRAMEWORK_SEARCH_PATHS = ""; FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
);
FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../contrib/Sparkle\"";
GCC_DYNAMIC_NO_PIC = NO; GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
...@@ -1212,7 +1224,11 @@ ...@@ -1212,7 +1224,11 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
COPY_PHASE_STRIP = YES; COPY_PHASE_STRIP = YES;
FRAMEWORK_SEARCH_PATHS = ""; FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
);
FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../contrib/Sparkle\"";
GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_SYMBOLS_PRIVATE_EXTERN = NO;
HEADER_SEARCH_PATHS = ""; HEADER_SEARCH_PATHS = "";
...@@ -1238,7 +1254,11 @@ ...@@ -1238,7 +1254,11 @@
CC402F490E00ABBB006A4BA4 /* Default */ = { CC402F490E00ABBB006A4BA4 /* Default */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
FRAMEWORK_SEARCH_PATHS = ""; FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
);
FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../contrib/Sparkle\"";
GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_SYMBOLS_PRIVATE_EXTERN = NO;
HEADER_SEARCH_PATHS = ""; HEADER_SEARCH_PATHS = "";
INFOPLIST_FILE = Info.plist; INFOPLIST_FILE = Info.plist;
......
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