Commit 70264925 authored by Rafaël Carré's avatar Rafaël Carré

OSX: Sparkle is not optional

Should close #5609
parent bcd564d4
...@@ -3721,12 +3721,12 @@ then ...@@ -3721,12 +3721,12 @@ then
VLC_ADD_LIBS([macosx], [-Wl,-framework,QTKit -Wl,-framework,IOKit -Wl,-framework,AddressBook -Wl,-framework,WebKit]) VLC_ADD_LIBS([macosx], [-Wl,-framework,QTKit -Wl,-framework,IOKit -Wl,-framework,AddressBook -Wl,-framework,WebKit])
VLC_SAVE_FLAGS if ! test -d ${CONTRIB_DIR}/Sparkle.framework
CFLAGS="-I${CONTRIB_DIR}/Sparkle.framework/Headers ${CFLAGS}" then
AC_CHECK_HEADERS(Sparkle.h, [ AC_MSG_ERROR([Sparkle framework is required and was not found in ${CONTRIB_DIR}])
VLC_ADD_LIBS([macosx], [-F${CONTRIB_DIR} -Wl,-framework,Sparkle]) fi
VLC_ADD_OBJCFLAGS([macosx], [-F${CONTRIB_DIR}]) VLC_ADD_LIBS([macosx], [-F${CONTRIB_DIR} -Wl,-framework,Sparkle])
], VLC_RESTORE_FLAGS) VLC_ADD_OBJCFLAGS([macosx], [-F${CONTRIB_DIR}])
if ! test -d ${CONTRIB_DIR}/BGHUDAppKit.framework if ! test -d ${CONTRIB_DIR}/BGHUDAppKit.framework
then then
......
...@@ -62,9 +62,7 @@ ...@@ -62,9 +62,7 @@
#import "TrackSynchronization.h" #import "TrackSynchronization.h"
#import <AddressBook/AddressBook.h> /* for crashlog send mechanism */ #import <AddressBook/AddressBook.h> /* for crashlog send mechanism */
#ifdef HAVE_SPARKLE_H #import <Sparkle/Sparkle.h> /* we're the update delegate */
# import <Sparkle/Sparkle.h> /* we're the update delegate */
#endif
/***************************************************************************** /*****************************************************************************
* Local prototypes. * Local prototypes.
...@@ -762,7 +760,6 @@ static VLCMain *_o_sharedMainInstance = nil; ...@@ -762,7 +760,6 @@ static VLCMain *_o_sharedMainInstance = nil;
[self setIntf:nil]; [self setIntf:nil];
} }
#ifdef HAVE_SPARKLE_H
#pragma mark - #pragma mark -
#pragma mark Sparkle delegate #pragma mark Sparkle delegate
/* received directly before the update gets installed, so let's shut down a bit */ /* received directly before the update gets installed, so let's shut down a bit */
...@@ -772,7 +769,6 @@ static VLCMain *_o_sharedMainInstance = nil; ...@@ -772,7 +769,6 @@ static VLCMain *_o_sharedMainInstance = nil;
[o_remote stopListening: self]; [o_remote stopListening: self];
var_SetInteger( p_intf->p_libvlc, "key-action", ACTIONID_STOP ); var_SetInteger( p_intf->p_libvlc, "key-action", ACTIONID_STOP );
} }
#endif
#pragma mark - #pragma mark -
#pragma mark Media Key support #pragma mark Media Key support
......
...@@ -35,9 +35,7 @@ ...@@ -35,9 +35,7 @@
#import "intf.h" #import "intf.h"
#import "AppleRemote.h" #import "AppleRemote.h"
#ifdef HAVE_SPARKLE_H #import <Sparkle/Sparkle.h> //for o_intf_last_update_lbl
# import <Sparkle/Sparkle.h> //for o_intf_last_update_lbl
#endif
static NSString* VLCSPrefsToolbarIdentifier = @"Our Simple Preferences Toolbar Identifier"; static NSString* VLCSPrefsToolbarIdentifier = @"Our Simple Preferences Toolbar Identifier";
static NSString* VLCIntfSettingToolbarIdentifier = @"Intf Settings Item Identifier"; static NSString* VLCIntfSettingToolbarIdentifier = @"Intf Settings Item Identifier";
...@@ -459,11 +457,9 @@ static inline char * __config_GetLabel( vlc_object_t *p_this, const char *psz_na ...@@ -459,11 +457,9 @@ static inline char * __config_GetLabel( vlc_object_t *p_this, const char *psz_na
[self setupButton: o_intf_embedded_ckb forBoolValue: "embedded-video"]; [self setupButton: o_intf_embedded_ckb forBoolValue: "embedded-video"];
[self setupButton: o_intf_appleremote_ckb forBoolValue: "macosx-appleremote"]; [self setupButton: o_intf_appleremote_ckb forBoolValue: "macosx-appleremote"];
[self setupButton: o_intf_mediakeys_ckb forBoolValue: "macosx-mediakeys"]; [self setupButton: o_intf_mediakeys_ckb forBoolValue: "macosx-mediakeys"];
#ifdef HAVE_SPARKLE_H
if( [[SUUpdater sharedUpdater] lastUpdateCheckDate] != NULL ) if( [[SUUpdater sharedUpdater] lastUpdateCheckDate] != NULL )
[o_intf_last_update_lbl setStringValue: [NSString stringWithFormat: _NS("Last check on: %@"), [[[SUUpdater sharedUpdater] lastUpdateCheckDate] descriptionWithLocale: [[NSUserDefaults standardUserDefaults] dictionaryRepresentation]]]]; [o_intf_last_update_lbl setStringValue: [NSString stringWithFormat: _NS("Last check on: %@"), [[[SUUpdater sharedUpdater] lastUpdateCheckDate] descriptionWithLocale: [[NSUserDefaults standardUserDefaults] dictionaryRepresentation]]]];
else else
#endif
[o_intf_last_update_lbl setStringValue: _NS("No check was performed yet.")]; [o_intf_last_update_lbl setStringValue: _NS("No check was performed yet.")];
psz_tmp = config_GetPsz( p_intf, "control" ); psz_tmp = config_GetPsz( p_intf, "control" );
if (psz_tmp) { if (psz_tmp) {
......
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