From: Dylan Baker <dylan@pnwbakers.com>
Date: Wed, 18 Apr 2018 20:19:20 +0000 (-0700)
Subject: meson: don't allow glvnd on windows
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=304719993120c463e14de40cbe0297e645142881;p=mesa.git

meson: don't allow glvnd on windows

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

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')