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

xrt: s/XRT_BUILD_*/XRT_BUILD_DRIVER_*/g

Browse source
This commit is contained in:
Jakob Bornecrantz 2019-09-27 12:03:36 +01:00
parent 765d263b96
commit d848ea010f
6 changed files with 32 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -134,7 +134,7 @@ if(TRUE)
set(BUILD_DRIVER_HDK TRUE)
set(BUILD_DRIVER_PSMV TRUE)
add_definitions(-DXRT_BUILD_HYDRA)
add_definitions(-DXRT_BUILD_DRIVER_HYDRA)
set(BUILD_DRIVER_HYDRA TRUE)
endif()

8
src/meson.build
View file

@ -2,10 +2,10 @@
# SPDX-License-Identifier: BSL-1.0
conf_data = configuration_data()
conf_data.set('XRT_BUILD_OHMD', 'ohmd' in drivers)
conf_data.set('XRT_BUILD_HDK', 'hdk' in drivers)
conf_data.set('XRT_BUILD_PSMV', 'psmv' in drivers)
conf_data.set('XRT_BUILD_PSVR', 'psvr' in drivers)
conf_data.set('XRT_BUILD_DRIVER_OHMD', 'ohmd' in drivers)
conf_data.set('XRT_BUILD_DRIVER_HDK', 'hdk' in drivers)
conf_data.set('XRT_BUILD_DRIVER_PSMV', 'psmv' in drivers)
conf_data.set('XRT_BUILD_DRIVER_PSVR', 'psvr' in drivers)
targets_enabled_h = configure_file(
input: 'targets_enabled_drivers.h.meson_in',

8
src/targets_enabled_drivers.h.cmake_in
View file

@ -7,10 +7,10 @@
#pragma once
#cmakedefine XRT_BUILD_OHMD
#cmakedefine XRT_BUILD_DRIVER_OHMD
#cmakedefine XRT_BUILD_HDK
#cmakedefine XRT_BUILD_DRIVER_HDK
#cmakedefine XRT_BUILD_PSMV
#cmakedefine XRT_BUILD_DRIVER_PSMV
#cmakedefine XRT_BUILD_PSVR
#cmakedefine XRT_BUILD_DRIVER_PSVR

8
src/targets_enabled_drivers.h.meson_in
View file

@ -7,10 +7,10 @@
#pragma once
#mesondefine XRT_BUILD_OHMD
#mesondefine XRT_BUILD_DRIVER_OHMD
#mesondefine XRT_BUILD_HDK
#mesondefine XRT_BUILD_DRIVER_HDK
#mesondefine XRT_BUILD_PSMV
#mesondefine XRT_BUILD_DRIVER_PSMV
#mesondefine XRT_BUILD_PSVR
#mesondefine XRT_BUILD_DRIVER_PSVR

12
src/xrt/targets/CMakeLists.txt
View file

@ -19,7 +19,7 @@ if(BUILD_WITH_JPEG)
endif()
if(BUILD_DRIVER_HDK)
set(XRT_BUILD_HDK TRUE)
set(XRT_BUILD_DRIVER_HDK TRUE)
list(APPEND DRIVER_OBJECTS $<TARGET_OBJECTS:drv_hdk>)
list(APPEND DRIVER_LIBRARIES ${HIDAPI_LIBRARIES})
endif()
@ -29,29 +29,29 @@ if(BUILD_DRIVER_HYDRA)
endif()
if(BUILD_DRIVER_OHMD)
set(XRT_BUILD_OHMD TRUE)
set(XRT_BUILD_DRIVER_OHMD TRUE)
list(APPEND DRIVER_OBJECTS $<TARGET_OBJECTS:drv_ohmd>)
list(APPEND DRIVER_LIBRARIES OpenHMD::OpenHMD)
endif()
if(BUILD_DRIVER_PSMV)
set(XRT_BUILD_PSMV TRUE)
set(XRT_BUILD_DRIVER_PSMV TRUE)
list(APPEND DRIVER_OBJECTS $<TARGET_OBJECTS:drv_psmv>)
endif()
if(BUILD_DRIVER_PSVR)
set(XRT_BUILD_PSVR TRUE)
set(XRT_BUILD_DRIVER_PSVR TRUE)
list(APPEND DRIVER_OBJECTS $<TARGET_OBJECTS:drv_psvr>)
list(APPEND DRIVER_LIBRARIES ${HIDAPI_LIBRARIES})
endif()
if(BUILD_DRIVER_V4L2)
set(XRT_BUILD_V4L2 TRUE)
set(XRT_BUILD_DRIVER_V4L2 TRUE)
list(APPEND DRIVER_OBJECTS $<TARGET_OBJECTS:drv_v4l2>)
endif()
if(BUILD_TRACKING)
set(XRT_BUILD_TRACKING TRUE)
set(XRT_BUILD_DRIVER_TRACKING TRUE)
list(APPEND DRIVER_OBJECTS $<TARGET_OBJECTS:aux_tracking>)
list(APPEND DRIVER_LIBRARIES ${OpenCV_LIBRARIES})
endif()

26
src/xrt/targets/common/target_lists.c
View file

@ -10,23 +10,23 @@
#include "target_lists.h"
#ifdef XRT_BUILD_HDK
#ifdef XRT_BUILD_DRIVER_HDK
#include "hdk/hdk_interface.h"
#endif
#ifdef XRT_BUILD_OHMD
#ifdef XRT_BUILD_DRIVER_OHMD
#include "ohmd/oh_interface.h"
#endif
#ifdef XRT_BUILD_PSMV
#ifdef XRT_BUILD_DRIVER_PSMV
#include "psmv/psmv_interface.h"
#endif
#ifdef XRT_BUILD_PSVR
#ifdef XRT_BUILD_DRIVER_PSVR
#include "psvr/psvr_interface.h"
#endif
#ifdef XRT_BUILD_HYDRA
#ifdef XRT_BUILD_DRIVER_HYDRA
#include "hydra/hydra_interface.h"
#endif
@ -49,18 +49,18 @@
* assign sequential elements of out_xdevs to the created devices.
*/
struct xrt_prober_entry target_entry_list[] = {
#ifdef XRT_BUILD_PSMV
#ifdef XRT_BUILD_DRIVER_PSMV
{PSMV_VID, PSMV_PID_ZCM1, psmv_found, "PS Move Controller (ZCM1)"},
{PSMV_VID, PSMV_PID_ZCM2, psmv_found, "PS Move Controller (ZCM2)"},
#endif // XRT_BUILD_PSMV
#endif // XRT_BUILD_DRIVER_PSMV
#ifdef XRT_BUILD_HYDRA
#ifdef XRT_BUILD_DRIVER_HYDRA
{HYDRA_VID, HYDRA_PID, hydra_found, "Razer Hydra"},
#endif // XRT_BUILD_HYDRA
#endif // XRT_BUILD_DRIVER_HYDRA
#ifdef XRT_BUILD_HDK
#ifdef XRT_BUILD_DRIVER_HDK
{HDK_VID, HDK_PID, hdk_found, "OSVR HDK"},
#endif // XRT_BUILD_HDK
#endif // XRT_BUILD_DRIVER_HDK
{0x0000, 0x0000, NULL, NULL}, // Terminate
};
@ -71,11 +71,11 @@ struct xrt_prober_entry *target_entry_lists[] = {
};
xrt_auto_prober_creator target_auto_list[] = {
#ifdef XRT_BUILD_PSVR
#ifdef XRT_BUILD_DRIVER_PSVR
psvr_create_auto_prober,
#endif
#ifdef XRT_BUILD_OHMD
#ifdef XRT_BUILD_DRIVER_OHMD
// OpenHMD last as we want to override it with native drivers.
oh_create_auto_prober,
#endif