diff options
author | Dylan Baker <[email protected]> | 2018-01-17 10:20:54 -0800 |
---|---|---|
committer | Dylan Baker <[email protected]> | 2018-02-15 10:38:43 -0800 |
commit | 2ab1ce30c4543fb4091795cbf6a5526e74c9e4aa (patch) | |
tree | 4787bce5a76e4521d765d0b755198227855931bf | |
parent | 0b73c329bc024d94d85d4e0bf5e95cd8be635eb2 (diff) |
meson: fix xvmc target linkage
This needs to link the state tracker with --whole-archive to expose the
right symbols.
v4: - Always add libswdri and libswkmsdri to the link_with list
Fixes: 22a817af8a89eb3c7 ("meson: build gallium xvmc state tracker")
Signed-off-by: Dylan Baker <[email protected]>
Acked-by: Eric Engestrom <[email protected]>
Reviewed-by: Emil Velikov <[email protected]>
-rw-r--r-- | src/gallium/targets/xvmc/meson.build | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/gallium/targets/xvmc/meson.build b/src/gallium/targets/xvmc/meson.build index 07d6c729c9a..2bf5ea23091 100644 --- a/src/gallium/targets/xvmc/meson.build +++ b/src/gallium/targets/xvmc/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 @@ libxvmc_gallium = shared_library( include_directories : [ inc_common, inc_util, inc_gallium_winsys, inc_gallium_drivers, ], + link_whole : [libxvmc_st], link_with : [ - libxvmc_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_thread, driver_r600, driver_nouveau], link_depends : xvmc_link_depends, |