Commit 72263a21 authored by Rafaël Carré's avatar Rafaël Carré

OSX: test and use frameworks correctly

parent 49bc0665
......@@ -3757,16 +3757,18 @@ then
VLC_ADD_PLUGIN([macosx minimal_macosx])
VLC_ADD_LIBS([macosx], [-Wl,-framework,QTKit -Wl,-framework,IOKit -Wl,-framework,AddressBook -Wl,-framework,WebKit])
AC_CHECK_HEADERS(Sparkle/Sparkle.h, [
VLC_ADD_LIBS([macosx], [-F${CONTRIB_DIR}/Sparkle -Wl,-framework,Sparkle])
VLC_ADD_OBJCFLAGS([macosx], [-F${CONTRIB_DIR}/Sparkle])
CFLAGS="-I${CONTRIB_DIR}/Sparkle.framework/Headers ${CFLAGS_saved}"
AC_CHECK_HEADERS(Sparkle.h, [
VLC_ADD_LIBS([macosx], [-F${CONTRIB_DIR} -Wl,-framework,Sparkle])
VLC_ADD_OBJCFLAGS([macosx], [-F${CONTRIB_DIR}])
])
if ! test -d ${CONTRIB_DIR}/BGHUDAppKit.framework
then
AC_MSG_ERROR([BGHUDAppKit framework is required and was not found in ${CONTRIB_DIR}])
fi
VLC_ADD_LIBS([macosx], [-F${CONTRIB_DIR}/BGHUDAppKit -Wl,-framework,BGHUDAppKit])
VLC_ADD_OBJCFLAGS([macosx], [-F${CONTRIB_DIR}/BGHUDAppKit])
VLC_ADD_LIBS([macosx], [-F${CONTRIB_DIR} -Wl,-framework,BGHUDAppKit])
VLC_ADD_OBJCFLAGS([macosx], [-F${CONTRIB_DIR}])
fi
......
......@@ -62,7 +62,7 @@
#import "TrackSynchronization.h"
#import <AddressBook/AddressBook.h> /* for crashlog send mechanism */
#ifdef HAVE_SPARKLE_SPARKLE_H
#ifdef HAVE_SPARKLE_H
# import <Sparkle/Sparkle.h> /* we're the update delegate */
#endif
......@@ -762,7 +762,7 @@ static VLCMain *_o_sharedMainInstance = nil;
[self setIntf:nil];
}
#ifdef HAVE_SPARKLE_SPARKLE_H
#ifdef HAVE_SPARKLE_H
#pragma mark -
#pragma mark Sparkle delegate
/* received directly before the update gets installed, so let's shut down a bit */
......
......@@ -35,7 +35,7 @@
#import "intf.h"
#import "AppleRemote.h"
#ifdef HAVE_SPARKLE_SPARKLE_H
#ifdef HAVE_SPARKLE_H
# import <Sparkle/Sparkle.h> //for o_intf_last_update_lbl
#endif
......@@ -459,7 +459,7 @@ 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_appleremote_ckb forBoolValue: "macosx-appleremote"];
[self setupButton: o_intf_mediakeys_ckb forBoolValue: "macosx-mediakeys"];
#ifdef HAVE_SPARKLE_SPARKLE_H
#ifdef HAVE_SPARKLE_H
if( [[SUUpdater sharedUpdater] lastUpdateCheckDate] != NULL )
[o_intf_last_update_lbl setStringValue: [NSString stringWithFormat: _NS("Last check on: %@"), [[[SUUpdater sharedUpdater] lastUpdateCheckDate] descriptionWithLocale: [[NSUserDefaults standardUserDefaults] dictionaryRepresentation]]]];
else
......
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