From 0a84fae16c8dbaff3bddc1cab0b046ff6bff5572 Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Fri, 17 Aug 2018 02:54:00 +0530 Subject: [PATCH] meson: host_system is 'ios' when building for iOS The cross file sets this value, and we use 'ios' in Cerbero. --- libs/gst/helpers/meson.build | 10 +++------- meson.build | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/libs/gst/helpers/meson.build b/libs/gst/helpers/meson.build index 71adc21..891ea55 100644 --- a/libs/gst/helpers/meson.build +++ b/libs/gst/helpers/meson.build @@ -27,13 +27,9 @@ if host_system == 'android' message('PTP not supported on Android because of permissions.') elif host_system == 'windows' message('PTP not supported on Windows, not ported yet.') -elif host_system == 'darwin' - if cc.has_header('MobileCoreServices/MobileCoreServices.h') - message('PTP not supported on iOS because of permissions.') - else - have_ptp = true - endif -elif ['linux', 'netbsd', 'freebsd', 'openbsd', 'kfreebsd', 'dragonfly', 'solaris'].contains(host_system) +elif host_system == 'ios' + message('PTP not supported on iOS because of permissions.') +elif ['linux', 'darwin', 'netbsd', 'freebsd', 'openbsd', 'kfreebsd', 'dragonfly', 'solaris'].contains(host_system) message('PTP supported on ' + host_system + '.') have_ptp = true endif diff --git a/meson.build b/meson.build index 3b50130..fa699ed 100644 --- a/meson.build +++ b/meson.build @@ -108,7 +108,7 @@ else cdata.set('MEMORY_ALIGNMENT', mem_align_opt.to_int()) endif -if host_system == 'darwin' +if ['darwin', 'ios'].contains(host_system) cdata.set_quoted('GST_EXTRA_MODULE_SUFFIX', '.dylib') endif -- 2.7.4