meson: replace with_*dri with with_dri_platform

This fixes the windows and macos stubs to be consistent with the *nix
path.

Signed-off-by: Dylan Baker <dylanx.c.baker@intel.com>
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>

diff --git a/meson.build b/meson.build
index d5a7c62266117217a3b6651d15c3c17164b7b180..6c273ed20cfefa1c09ae0befaf7dff1c678f800a 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -52,10 +52,6 @@ if get_option('texture-float')
   message('WARNING: Floating-point texture enabled. Please consult docs/patents.txt and your lawyer before building mesa.')
 endif
 
-# XXX: yeah, do these
-with_appledri = false
-with_windowsdri = false
-
 dri_drivers_path = get_option('dri-drivers-path')
 if dri_drivers_path == ''
   dri_drivers_path = join_paths(get_option('libdir'), 'dri')

diff --git a/src/glx/meson.build b/src/glx/meson.build
index 43f8fb24efd0f866a0ee30fccb1b245f80cd47fa..deef3ed2235ccc7092bda7e3df7504f6485b0d24 100644 (file)
--- a/src/glx/meson.build
+++ b/src/glx/meson.build
@@ -95,9 +95,9 @@ if with_dri3
   files_libglx += files('dri3_glx.c', 'dri3_priv.h')
 endif
 
-if with_appledri
+if with_dri_platform == 'apple'
   files_libglx += files('applegl_glx.c')
-elif with_windowsdri
+elif with_dri_platform == 'windows'
   files_libglx += files('driwindows_glx.c')
   # TODO
   #extra_libs_libglx += [

diff --git a/src/mapi/glapi/meson.build b/src/mapi/glapi/meson.build
index d2d86afd6c1f07e064894eb2e7622f190ce89d7e..f20126447852d91310ca8fe0be388a305621a3ce 100644 (file)
--- a/src/mapi/glapi/meson.build
+++ b/src/mapi/glapi/meson.build
@@ -23,7 +23,7 @@ inc_glapi = include_directories('.')
 static_glapi_files = []
 static_glapi_args = []
 
-if with_appledri or with_windowsdri
+if ['apple', 'windows'].contains(with_dri_platform)
   static_glapi_files += files('glapi_gentable.c')
 endif