From e7add205d8fdfcb31a569e282284b10db83130b9 Mon Sep 17 00:00:00 2001 From: der richter Date: Mon, 23 Dec 2019 00:02:23 +0100 Subject: 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 --- osdep/macosx_application.m | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'osdep') 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]]; -- cgit v1.2.3