From 0146ad219e8855fb7fe128632f3168e3b44ca9ef Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Sat, 1 Sep 2018 21:48:31 +0530 Subject: [PATCH] meson: Fix applemedia dependencies on iOS These were accidentally not being found because they were incorrectly specified. --- sys/applemedia/meson.build | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/applemedia/meson.build b/sys/applemedia/meson.build index 71cdb5dc51..819146f227 100644 --- a/sys/applemedia/meson.build +++ b/sys/applemedia/meson.build @@ -23,7 +23,6 @@ if not ['darwin', 'ios'].contains(host_system) or applemedia_option.disabled() subdir_done() endif -applemedia_deps_found = false applemedia_frameworks = [] corefoundation_dep = dependency('CoreFoundation', required : applemedia_option) coremedia_dep = dependency('CoreMedia', required : applemedia_option) @@ -57,9 +56,8 @@ if host_system == 'ios' ] applemedia_objc_args += ['-fobjc-abi-version=2', '-fobjc-legacy-dispatch'] - foundation_dep = dependency('Foundation', required : applemedia_option) - coremedia_dep = dependency('AssetsLibrary', required : applemedia_option) - applemedia_frameworks += [foundation_dep, coremedia_dep] + ios_media_dep = dependency('appleframeworks', modules : ['Foundation', 'AssetsLibrary'], required : applemedia_option) + applemedia_frameworks += [ios_media_dep] else applemedia_sources += [ 'iosurfacememory.c'