mirror of https://gitlab.freedesktop.org/mesa/mesa
meson: Add support for configuring dri drivers directory.
v2: - drop with_ from dri_drivers_path variable (Eric A) v3: - Move HAVE_X11_PLATFORM to the proper patch (Eric A) Signed-off-by: Dylan Baker <dylanx.c.baker@intel.com> Reviewed-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
parent
a47c525f32
commit
db9788420d
|
@ -42,6 +42,11 @@ with_asm = get_option('asm')
|
||||||
with_appledri = false
|
with_appledri = false
|
||||||
with_windowsdri = 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')
|
||||||
|
endif
|
||||||
|
|
||||||
with_gles1 = get_option('gles1')
|
with_gles1 = get_option('gles1')
|
||||||
with_gles2 = get_option('gles2')
|
with_gles2 = get_option('gles2')
|
||||||
with_opengl = get_option('opengl')
|
with_opengl = get_option('opengl')
|
||||||
|
|
|
@ -24,6 +24,8 @@ option('dri3', type : 'combo', value : 'auto', choices : ['auto', 'yes', 'no'],
|
||||||
description : 'enable support for dri3')
|
description : 'enable support for dri3')
|
||||||
option('dri-drivers', type : 'string', value : 'i965',
|
option('dri-drivers', type : 'string', value : 'i965',
|
||||||
description : 'comma separated list of dri drivers to build.')
|
description : 'comma separated list of dri drivers to build.')
|
||||||
|
option('dri-drivers-path', type : 'string', value : '',
|
||||||
|
description : 'Location of dri drivers. Default: $libdir/dri.')
|
||||||
option('vulkan-drivers', type : 'string', value : 'intel,amd',
|
option('vulkan-drivers', type : 'string', value : 'intel,amd',
|
||||||
description : 'comma separated list of vulkan drivers to build.')
|
description : 'comma separated list of vulkan drivers to build.')
|
||||||
option('shader-cache', type : 'boolean', value : true,
|
option('shader-cache', type : 'boolean', value : true,
|
||||||
|
|
|
@ -106,7 +106,7 @@ elif with_windowsdri
|
||||||
#]
|
#]
|
||||||
endif
|
endif
|
||||||
|
|
||||||
dri_driver_dir = join_paths(get_option('prefix'), get_option('libdir'), 'dri')
|
dri_driver_dir = join_paths(get_option('prefix'), dri_drivers_path)
|
||||||
if not with_glvnd
|
if not with_glvnd
|
||||||
gl_lib_name = 'GL'
|
gl_lib_name = 'GL'
|
||||||
gl_lib_version = '1.2.0'
|
gl_lib_version = '1.2.0'
|
||||||
|
|
|
@ -49,7 +49,7 @@ if with_dri
|
||||||
meson.add_install_script(
|
meson.add_install_script(
|
||||||
join_paths(meson.source_root(), 'bin/install_megadrivers.py'),
|
join_paths(meson.source_root(), 'bin/install_megadrivers.py'),
|
||||||
libmesa_dri_drivers.full_path(),
|
libmesa_dri_drivers.full_path(),
|
||||||
join_paths(get_option('libdir'), 'dri'),
|
dri_drivers_path,
|
||||||
dri_link,
|
dri_link,
|
||||||
)
|
)
|
||||||
endif
|
endif
|
||||||
|
|
Loading…
Reference in New Issue