mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2025-02-01 11:28:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

t/common: Replace references to xrt_prober_create

Browse source
This commit is contained in:
Ryan Pavlik 2020-05-26 16:46:11 -05:00
parent c42675437b
commit 6c77b8d314
4 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/xrt/targets/cli/meson.build
View file

@ -8,8 +8,8 @@ cli = executable(
'cli_cmd_probe.c', 'cli_cmd_probe.c',
'cli_cmd_test.c', 'cli_cmd_test.c',
'cli_common.h', 'cli_common.h',
'cli_instance.c',
'cli_main.c', 'cli_main.c',
'cli_prober.c',
), ),
link_whole: [ link_whole: [
lib_aux_os, lib_aux_os,

2
src/xrt/targets/common/CMakeLists.txt
View file

@ -82,6 +82,8 @@ add_library(target_instance STATIC
target_link_libraries(target_instance PRIVATE target_link_libraries(target_instance PRIVATE
xrt-interfaces xrt-interfaces
aux_util aux_util
st_prober
target_lists
) )
target_include_directories(target_instance PRIVATE target_include_directories(target_instance PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/../../drivers ${CMAKE_CURRENT_SOURCE_DIR}/../../drivers

1
src/xrt/targets/common/meson.build
View file

@ -18,5 +18,6 @@ lib_target_instance = static_library(
'target_instance.c', 'target_instance.c',
), ),
include_directories: [xrt_include], include_directories: [xrt_include],
link_with: [lib_target_lists, lib_st_prober],
dependencies: [aux], dependencies: [aux],
) )

4
src/xrt/targets/common/target_instance.c
View file

@ -6,6 +6,8 @@
* @author Jakob Bornecrantz <jakob@collabora.com> * @author Jakob Bornecrantz <jakob@collabora.com>
*/ */
#include "target_lists.h"
#include "xrt/xrt_prober.h" #include "xrt/xrt_prober.h"
#include "xrt/xrt_instance.h" #include "xrt/xrt_instance.h"
#include "xrt/xrt_gfx_fd.h" #include "xrt/xrt_gfx_fd.h"
@ -102,7 +104,7 @@ xrt_instance_create(struct xrt_instance **out_xinst)
{ {
struct xrt_prober *xp = NULL; struct xrt_prober *xp = NULL;
int ret = xrt_prober_create(&xp); int ret = xrt_prober_create_with_lists(&xp, &target_lists);
if (ret < 0) { if (ret < 0) {
return ret; return ret;
} }