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

d/psvr: Add to meta prober and OpenXR target

Browse source 
Still hidden behind a env variable.
This commit is contained in:
Jakob Bornecrantz 2019-04-20 02:24:09 +01:00 committed by Ryan Pavlik
parent 42cddb2580
commit 83159a02c1
2 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/xrt/auxiliary/util/u_meta_prober.h
View file

@ -12,12 +12,16 @@
#include <stdlib.h> #include <stdlib.h>
#include "xrt/xrt_prober.h" #include "xrt/xrt_prober.h"
#ifdef XRT_BUILD_HDK
#include "hdk/hdk_interface.h"
#endif
#ifdef XRT_BUILD_OHMD #ifdef XRT_BUILD_OHMD
#include "ohmd/oh_interface.h" #include "ohmd/oh_interface.h"
#endif #endif
#ifdef XRT_BUILD_HDK #ifdef XRT_BUILD_PSVR
#include "hdk/hdk_interface.h" #include "psvr/psvr_interface.h"
#endif #endif
@ -34,6 +38,11 @@ static const prober_creator DRIVERS[] = {
hdk_create_auto_prober, hdk_create_auto_prober,
#endif #endif
#ifdef XRT_BUILD_PSVR
// Returns NULL if none found, so OK to go first.
psvr_create_auto_prober,
#endif
#ifdef XRT_BUILD_OHMD #ifdef XRT_BUILD_OHMD
oh_create_auto_prober, oh_create_auto_prober,
#endif #endif

8
src/xrt/targets/openxr/CMakeLists.txt
View file

@ -75,14 +75,18 @@ target_link_libraries(${RUNTIME_TARGET}
OpenGL::GLX OpenGL::GLX
) )
if(BUILD_DRIVER_HDK)
target_sources(${RUNTIME_TARGET} PRIVATE $<TARGET_OBJECTS:drv_hdk>)
target_link_libraries(${RUNTIME_TARGET} PUBLIC ${HIDAPI_LIBRARIES})
endif()
if(BUILD_DRIVER_OHMD) if(BUILD_DRIVER_OHMD)
target_sources(${RUNTIME_TARGET} PRIVATE $<TARGET_OBJECTS:drv_ohmd>) target_sources(${RUNTIME_TARGET} PRIVATE $<TARGET_OBJECTS:drv_ohmd>)
target_link_libraries(${RUNTIME_TARGET} PRIVATE OpenHMD::OpenHMD) target_link_libraries(${RUNTIME_TARGET} PRIVATE OpenHMD::OpenHMD)
endif() endif()
if(BUILD_DRIVER_HDK) if(BUILD_DRIVER_PSVR)
target_sources(${RUNTIME_TARGET} PRIVATE $<TARGET_OBJECTS:drv_hdk>) target_sources(${RUNTIME_TARGET} PRIVATE $<TARGET_OBJECTS:drv_psvr>)
target_link_libraries(${RUNTIME_TARGET} PUBLIC ${HIDAPI_LIBRARIES}) target_link_libraries(${RUNTIME_TARGET} PUBLIC ${HIDAPI_LIBRARIES})
endif() endif()