KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

meson: Don't compile pipe loader with dri support when not using dri 

Corrects building glx as gallium-xlib without any dri targets.

v2: - fix ugly formatting

Fixes: 66c94b9313
       ("meson: build gallium winsys for dri, null, and wrapper")

Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>
This commit is contained in:
Dylan Baker 2018-09-17 08:56:51 -07:00
parent fe3f13cc5a
commit 5dcb77e491
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/gallium/auxiliary/pipe-loader/meson.build
View File

@ -31,6 +31,9 @@ libpipe_loader_defines = []
if dep_libdrm.found()
files_pipe_loader += files('pipe_loader_drm.c')
endif
if with_dri
libpipe_loader_defines += '-DHAVE_PIPE_LOADER_DRI'
endif
if with_gallium_drisw_kms
libpipe_loader_defines += '-DHAVE_PIPE_LOADER_KMS'
endif
@ -42,10 +45,7 @@ libpipe_loader_static = static_library(
inc_util, inc_loader, inc_gallium, inc_include, inc_src, inc_gallium_aux,
inc_gallium_winsys,
],
c_args : [
c_vis_args, '-DHAVE_PIPE_LOADER_DRI', '-DGALLIUM_STATIC_TARGETS=1',
libpipe_loader_defines,
],
c_args : [c_vis_args, libpipe_loader_defines, '-DGALLIUM_STATIC_TARGETS=1'],
link_with : [libloader, libxmlconfig],
dependencies : [dep_libdrm],
build_by_default : false,
@ -59,7 +59,7 @@ libpipe_loader_dynamic = static_library(
inc_gallium_winsys,
],
c_args : [
c_vis_args, libpipe_loader_defines, '-DHAVE_PIPE_LOADER_DRI',
c_vis_args, libpipe_loader_defines,
'-DPIPE_SEARCH_DIR="@0@"'.format(
join_paths(get_option('prefix'), get_option('libdir'), 'gallium-pipe')
)