summaryrefslogtreecommitdiffstats
path: root/src/gallium/targets
diff options
context:
space:
mode:
authorDylan Baker <[email protected]>2018-01-17 09:49:55 -0800
committerDylan Baker <[email protected]>2018-02-15 10:36:16 -0800
commit2e4be28fb2a256c423485cc99b1250b2d3c92da6 (patch)
treeffc0fe8a112e5da708fa844c9790d534985ebe86 /src/gallium/targets
parent90d361753ce5a5e705adecbc68edaf7a6d0f51ee (diff)
meson: fix va target linkage
The state tracker needs to be linked with whole-archive (like autotools). As a result there are symbols from libswdri and libswkmsdri that are needed, so link those as well. v4: - Always add libswdri and libswkmsdri to link_with list Fixes: 5a785d51a6d6 ("meson: build gallium va state tracker") 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/va/meson.build7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/gallium/targets/va/meson.build b/src/gallium/targets/va/meson.build
index 1e453c9f760..57d267e5b6e 100644
--- a/src/gallium/targets/va/meson.build
+++ b/src/gallium/targets/va/meson.build
@@ -1,4 +1,4 @@
-# Copyright © 2017 Intel Corporation
+# Copyright © 2017-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
@@ -40,9 +40,10 @@ libva_gallium = shared_library(
include_directories : [
inc_common, inc_util, inc_gallium_winsys, inc_gallium_drivers,
],
+ link_whole : [libva_st],
link_with : [
- libva_st, libgalliumvlwinsys, libgalliumvl, libgallium, libmesa_util,
- libpipe_loader_static, libws_null, libwsw,
+ libgalliumvlwinsys, libgalliumvl, libgallium, libmesa_util,
+ libpipe_loader_static, libws_null, libwsw, libswdri, libswkmsdri,
],
dependencies : [
dep_libdrm, dep_thread, driver_r600, driver_radeonsi, driver_nouveau,