diff options
| author | Dylan Baker <[email protected]> | 2017-11-20 16:34:28 -0800 |
|---|---|---|
| committer | Dylan Baker <[email protected]> | 2017-11-22 12:47:43 -0800 |
| commit | c2dad6ca0a120ae133fe32925c20e1e9856132d9 (patch) | |
| tree | 0f217c5900128738ed10974ab0e54e925276c99b | |
| parent | 33627d23d03ee6273c5aa874a85978777271582f (diff) | |
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 <[email protected]>
Reviewed-by: Eric Engestrom <[email protected]>
| -rw-r--r-- | meson.build | 4 | ||||
| -rw-r--r-- | src/glx/meson.build | 4 | ||||
| -rw-r--r-- | src/mapi/glapi/meson.build | 2 |
3 files changed, 3 insertions, 7 deletions
diff --git a/meson.build b/meson.build index d5a7c622661..6c273ed20cf 100644 --- 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 43f8fb24efd..deef3ed2235 100644 --- 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 d2d86afd6c1..f2012644785 100644 --- 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 |