diff options
| author | Dylan Baker <[email protected]> | 2017-11-15 10:50:11 -0800 |
|---|---|---|
| committer | Dylan Baker <[email protected]> | 2017-12-04 14:35:48 -0800 |
| commit | 60283769ec3ad05f31d8f66576d5b3c94968a6de (patch) | |
| tree | 2e7319782c5388ae4508757684a88d0fa16db43f /src/gallium/targets | |
| parent | 95a791f63ee6749913c36d29a3eb69ad227dd995 (diff) | |
meson: Use driver dependencies for libgl-xlib target
v2: - put driver_swrast in the right field
- add dep_threads (dep_llvm requires threads, so it masked this
previously)
Signed-off-by: Dylan Baker <[email protected]>
Acked-by: Eric Engestrom <[email protected]>
Diffstat (limited to 'src/gallium/targets')
| -rw-r--r-- | src/gallium/targets/libgl-xlib/meson.build | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/gallium/targets/libgl-xlib/meson.build b/src/gallium/targets/libgl-xlib/meson.build index 825b7b4a0f1..c7587d30d80 100644 --- a/src/gallium/targets/libgl-xlib/meson.build +++ b/src/gallium/targets/libgl-xlib/meson.build @@ -29,10 +29,7 @@ gallium_xlib_c_args = [ ] gallium_xlib_ld_args = [] gallium_xlib_link_with = [] -gallium_xlib_depends = [] gallium_xlib_link_depends = [] -gallium_xlib_xlibvers = [] -gallium_xlib_sources = [] if with_ld_version_script gallium_xlib_ld_args += ['-Wl,--version-script', join_paths(meson.current_source_dir(), 'libgl-xlib.sym')] @@ -41,11 +38,6 @@ endif if with_shared_glapi gallium_xlib_link_with += libglapi endif -if with_llvm - gallium_xlib_c_args += '-DGALLIUM_LLVMPIPE' - gallium_xlib_depends += dep_llvm - gallium_xlib_link_with += libllvmpipe -endif # TODO: SWR libgl = shared_library( @@ -59,10 +51,10 @@ libgl = shared_library( link_args : [ld_args_bsymbolic, ld_args_gc_sections, gallium_xlib_ld_args], link_depends : gallium_xlib_link_depends, link_with : [ - libxlib, libws_xlib, libsoftpipe, libtrace, librbug, libglapi_static, + libxlib, libws_xlib, libtrace, librbug, libglapi_static, libgallium, libmesa_util, libmesa_gallium, gallium_xlib_link_with, ], - dependencies : [dep_clock, dep_unwind, gallium_xlib_depends], + dependencies : [dep_thread, dep_clock, dep_unwind, driver_swrast], install : true, version : '1.5.0', ) |