fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 19:40:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

meson: Don't allow glx to be built without platform_x11

Browse source 
Previously this failed to change with_glx to disabled from auto if
platform_x11 was unset or if no opengl apis were being built.

v2: - swap conditional positions

Signed-off-by: Dylan Baker <dylanx.c.baker@intel.com>
Reviewed-and-Tested-by: Eric Engestrom <eric@engestrom.ch>
This commit is contained in:
Dylan Baker 2017-10-18 15:47:11 -07:00
parent 8792a9e01b
commit 8d3b1210cb
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
meson.build
View file

@ -157,8 +157,12 @@ endif
pre_args += '-DGLX_USE_TLS' pre_args += '-DGLX_USE_TLS'
with_glx = get_option('glx') with_glx = get_option('glx')
if with_glx != 'disabled' if with_glx != 'disabled'
if not (with_platform_x11 and with_any_opengl) and with_glx != 'auto' if not (with_platform_x11 and with_any_opengl)
error('Cannot build GLX support without X11 platform support and at least one OpenGL API') if with_glx == 'auto'
with_glx = 'disabled'
else
error('Cannot build GLX support without X11 platform support and at least one OpenGL API')
endif
elif with_glx == 'gallium-xlib' elif with_glx == 'gallium-xlib'
if not with_gallium if not with_gallium
error('Gallium-xlib based GLX requires at least one gallium driver') error('Gallium-xlib based GLX requires at least one gallium driver')