summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorder richter <der.richter@gmx.de>2019-12-23 00:02:23 +0100
committerder richter <der.richter@gmx.de>2019-12-23 23:44:20 +0100
commite7add205d8fdfcb31a569e282284b10db83130b9 (patch)
tree576580e6e609a96634149c516f5ccf9e8b96efa1
parent9f2fda7d8530b5ce1e32dbaa7578c5d45cbf7a3d (diff)
downloadmpv-e7add205d8fdfcb31a569e282284b10db83130b9.tar.bz2
mpv-e7add205d8fdfcb31a569e282284b10db83130b9.tar.xz
build: fix build with disabled swift and Media Player
when swift is disabled some headers are not included. one of them is the options/options.h header that is needed for the vo_sub_opts struct. we include it to fix the build without swift. the second problem is the build time check for the macOS 10.12.2 features or more specific the Media Player support. since it is a swift feature we can not use it when swift is disabled. add a separate Media Player check that also depends on swift and use that new preprocessor variable as a build time check instead. Fixes #7282
-rw-r--r--osdep/macosx_application.m3
-rw-r--r--wscript5
2 files changed, 7 insertions, 1 deletions
diff --git a/osdep/macosx_application.m b/osdep/macosx_application.m
index 3d420a3152..43f3bb4a4f 100644
--- a/osdep/macosx_application.m
+++ b/osdep/macosx_application.m
@@ -24,6 +24,7 @@
#include "input/input.h"
#include "player/client.h"
#include "options/m_config.h"
+#include "options/options.h"
#import "osdep/macosx_application_objc.h"
#include "osdep/macosx_compat.h"
@@ -299,7 +300,7 @@ static void init_cocoa_application(bool regular)
[NSApp setDelegate:NSApp];
[NSApp setMenuBar:[[MenuBar alloc] init]];
-#if HAVE_MACOS_10_12_2_FEATURES
+#if HAVE_MACOS_MEDIA_PLAYER
// 10.12.2 runtime availability check
if ([NSApp respondsToSelector:@selector(touchBar)]) {
[NSApp setRemoteCommandCenter:[[RemoteCommandCenter alloc] initWithApp:NSApp]];
diff --git a/wscript b/wscript
index b7fc0b474d..def7f77738 100644
--- a/wscript
+++ b/wscript
@@ -928,6 +928,11 @@ standalone_features = [
'desc': 'macOS 10.14 SDK Features',
'deps': 'cocoa',
'func': check_macos_sdk('10.14')
+ },{
+ 'name': '--macos-media-player',
+ 'desc': 'macOS Media Player support',
+ 'deps': 'macos-10-12-2-features && swift',
+ 'func': check_true
}, {
'name': '--macos-cocoa-cb',
'desc': 'macOS libmpv backend',