From be879f9f290c5277097ec82ffb7d8d2de2e2707a Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Mon, 12 Feb 2018 10:58:58 -0800 Subject: [PATCH] meson: add libswdri and libswkmsdri to d3dadaptor link_with v5: - Fix libswdi -> libswdri typo Fixes: 6b4c7047d571 ("meson: build gallium nine state_tracker") Signed-off-by: Dylan Baker Acked-by: Eric Engestrom Reviewed-by: Emil Velikov --- src/gallium/targets/d3dadapter9/meson.build | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/gallium/targets/d3dadapter9/meson.build b/src/gallium/targets/d3dadapter9/meson.build index 5476e80e70c..fd608be9bf6 100644 --- a/src/gallium/targets/d3dadapter9/meson.build +++ b/src/gallium/targets/d3dadapter9/meson.build @@ -1,4 +1,5 @@ # Copyright © 2017 Dylan Baker +# Copyright © 2018 Intel Corporation # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -31,20 +32,12 @@ gallium_nine_c_args = [ ] gallium_nine_ld_args = [] gallium_nine_link_depends = [] -gallium_nine_link_with = [] if with_ld_version_script gallium_nine_ld_args += ['-Wl,--version-script', join_paths(meson.current_source_dir(), 'd3dadapter9.sym')] gallium_nine_link_depends += files('d3dadapter9.sym') endif -if with_dri - gallium_nine_link_with += libswdri -endif -if with_gallium_drisw_kms - gallium_nine_link_with += libswkmsdri -endif - libgallium_nine = shared_library( 'd3dadapter9', [files('description.c', 'getproc.c', 'drm.c'), xmlpool_options_h], @@ -60,8 +53,8 @@ libgallium_nine = shared_library( link_depends : gallium_nine_link_depends, link_with : [ libgalliumvl_stub, libgallium, libnine_st, libmesa_util, libddebug, - librbug, libtrace, libpipe_loader_static, libws_null, libwsw, - gallium_nine_link_with, + librbug, libtrace, libpipe_loader_static, libws_null, libwsw, libswdri, + libswkmsdri, ], dependencies : [ dep_selinux, dep_expat, dep_libdrm, dep_llvm,