From b8521704ed2f5e84f0599a040c015ef02890468d Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Mon, 1 Oct 2018 12:40:34 -0700 Subject: [PATCH] meson: Don't allow building EGL on Windows or MacOS Currently mesa only supports EGL on Unix like systems, cygwin, and haiku. Meson should actually enforce this. This fixes the default build on MacOS. v2: - invert the condition, mark darwin and windows as not supported instead of trying to mark what is supported. v3: - add missing ) v3: - Update comment to reflect condition change in v2 CC: 18.2 Reviewed-by: Eric Engestrom --- meson.build | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index e4b9f04949c..002ce35a608 100644 --- a/meson.build +++ b/meson.build @@ -306,7 +306,10 @@ endif _egl = get_option('egl') if _egl == 'auto' - with_egl = with_dri and with_shared_glapi and with_platforms + with_egl = ( + not ['darwin', 'windows'].contains(host_machine.system()) and + with_dri and with_shared_glapi and with_platforms + ) elif _egl == 'true' if not with_dri error('EGL requires dri') @@ -316,6 +319,8 @@ elif _egl == 'true' error('No platforms specified, consider -Dplatforms=drm,x11,surfaceless at least') elif not ['disabled', 'dri'].contains(with_glx) error('EGL requires dri, but a GLX is being built without dri') + elif ['darwin', 'windows'].contains(host_machine.system()) + error('EGL is not available on Windows or MacOS') endif with_egl = true else -- 2.30.2