From 4b61b07e4b61fdb8ed90a02f3716e608b4d10fc8 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Wed, 15 Nov 2017 17:31:32 -0800 Subject: [PATCH] meson: Convert platform to auto This is necessary to support operating systems other than the *nix family (excluding macOS). For Linux nothing has changed, the defaults are still the same. Signed-off-by: Dylan Baker Reviewed-by: Eric Engestrom --- meson.build | 7 +++++++ meson_options.txt | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index fe3eb8ee210..f8007dff0e8 100644 --- a/meson.build +++ b/meson.build @@ -198,6 +198,13 @@ with_platform_drm = false with_platform_surfaceless = false egl_native_platform = '' _platforms = get_option('platforms') +if _platforms == 'auto' + if ['linux'].contains(host_machine.system()) + _platforms = 'x11,wayland,drm,surfaceless' + else + error('Unknown OS, no platforms enabled. Patches gladly accepted to fix this.') + endif +endif if _platforms != '' _split = _platforms.split(',') with_platform_android = _split.contains('android') diff --git a/meson_options.txt b/meson_options.txt index 6c9cd33998c..1134a250295 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -21,8 +21,8 @@ option( 'platforms', type : 'string', - value : 'x11,wayland,drm,surfaceless', - description : 'comma separated list of window systems to support. wayland, x11, surfaceless, drm, etc.' + value : 'auto', + description : 'comma separated list of window systems to support. If this is set to auto all platforms applicable to the OS will be enabled.' ) option( 'dri3', -- 2.30.2