Mesa (master): meson: don't allow glvnd on windows

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 304719993120c463e14de40cbe0297e645142881
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=304719993120c463e14de40cbe0297e645142881

Author: Dylan Baker <dylan at pnwbakers.com>
Date:   Wed Apr 18 13:19:20 2018 -0700

meson: don't allow glvnd on windows

Reviewed-by: Eric Anholt <eric at anholt.net>
Reviewed-by: Eric Engestrom <eric.engestrom at intel.com>

---

 meson.build | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index 26c1b0bb376..f268c81b44b 100644
--- a/meson.build
+++ b/meson.build
@@ -418,7 +418,9 @@ endif
 
 with_glvnd = get_option('glvnd')
 if with_glvnd
-  if with_glx == 'xlib' or with_glx == 'gallium-xlib'
+  if with_platform_windows
+    error('glvnd cannot be used on Windows')
+  elif with_glx == 'xlib' or with_glx == 'gallium-xlib'
     error('Cannot build glvnd support for GLX that is not DRI based.')
   elif with_glx == 'disabled' and not with_egl
     error('glvnd requires DRI based GLX and/or EGL')