summaryrefslogtreecommitdiffstats
path: root/src/gallium/targets
diff options
context:
space:
mode:
authorDylan Baker <[email protected]>2018-02-12 11:03:47 -0800
committerDylan Baker <[email protected]>2018-02-15 10:35:42 -0800
commit8eb608df61912cfd0633fe982b140e22e7563770 (patch)
tree7b73b5d3baf80b3749777aa77473e7846e9183e6 /src/gallium/targets
parentbe879f9f290c5277097ec82ffb7d8d2de2e2707a (diff)
meson: add libswdri and libswkmsdri to dri link_with
Fixes: b154b44ae342 ("meson: build radeonsi gallium driver") Signed-off-by: Dylan Baker <[email protected]> Acked-by: Eric Engestrom <[email protected]> Reviewed-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src/gallium/targets')
-rw-r--r--src/gallium/targets/dri/meson.build11
1 files changed, 2 insertions, 9 deletions
diff --git a/src/gallium/targets/dri/meson.build b/src/gallium/targets/dri/meson.build
index 75ce94ab2cc..a4326227f0f 100644
--- a/src/gallium/targets/dri/meson.build
+++ b/src/gallium/targets/dri/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
@@ -29,7 +30,6 @@ gallium_dri_c_args = [
'-DGALLIUME_TRACE',
]
gallium_dri_ld_args = []
-gallium_dri_link_with = []
gallium_dri_link_depends = []
gallium_dri_drivers = []
@@ -42,13 +42,6 @@ if with_ld_dynamic_list
gallium_dri_link_depends += files('../dri-vdpau.dyn')
endif
-if with_dri
- gallium_dri_link_with += libswdri
-endif
-if with_gallium_drisw_kms
- gallium_dri_link_with += libswkmsdri
-endif
-
libgallium_dri = shared_library(
'gallium_dri',
[files('target.c'), xmlpool_options_h],
@@ -63,7 +56,7 @@ libgallium_dri = shared_library(
link_with : [
libmesa_gallium, libdricommon, libmegadriver_stub, libdri, libgalliumvl,
libgallium, libddebug, libnoop, librbug, libtrace, libglapi,
- libpipe_loader_static, libws_null, libwsw, gallium_dri_link_with,
+ libpipe_loader_static, libws_null, libwsw, libswdri, libswkmsdri,
],
dependencies : [
dep_selinux, dep_expat, dep_libdrm, dep_llvm, dep_thread,