a/os: Refactor out BLE functions into own library

This commit is contained in:
Jakob Bornecrantz 2022-10-22 21:57:54 +01:00 committed by Ryan Pavlik
parent 96eabd1347
commit 637c49c1ea
2 changed files with 18 additions and 14 deletions
src/xrt
auxiliary/os
drivers

View file

@ -1,20 +1,24 @@
# Copyright 2019-2022, Collabora, Ltd. # Copyright 2019-2022, Collabora, Ltd.
# SPDX-License-Identifier: BSL-1.0 # SPDX-License-Identifier: BSL-1.0
add_library( ####
aux_os STATIC # Main os library
os_ble.h #
os_documentation.h
os_hid.h add_library(aux_os STATIC os_documentation.h os_hid.h os_hid_hidraw.c os_threading.h)
os_hid_hidraw.c
os_threading.h
)
target_link_libraries(aux_os PUBLIC aux-includes xrt-pthreads) target_link_libraries(aux_os PUBLIC aux-includes xrt-pthreads)
####
# BLE library
#
add_library(aux_os_ble STATIC os_ble.h)
target_link_libraries(aux_os_ble PUBLIC aux-includes aux_os)
if(XRT_HAVE_DBUS) if(XRT_HAVE_DBUS)
target_sources(aux_os PRIVATE os_ble_dbus.c) target_sources(aux_os_ble PRIVATE os_ble_dbus.c)
target_link_libraries(aux_os PRIVATE ${DBUS_LIBRARIES}) target_link_libraries(aux_os_ble PRIVATE ${DBUS_LIBRARIES})
target_include_directories(aux_os SYSTEM PRIVATE ${DBUS_INCLUDE_DIRS}) target_include_directories(aux_os_ble SYSTEM PRIVATE ${DBUS_INCLUDE_DIRS})
else() else()
target_sources(aux_os PRIVATE os_ble_stubs.c) target_sources(aux_os_ble PRIVATE os_ble_stubs.c)
endif() endif()

View file

@ -13,7 +13,7 @@ if(XRT_BUILD_DRIVER_ARDUINO)
drv_arduino STATIC arduino/arduino_device.c arduino/arduino_interface.h drv_arduino STATIC arduino/arduino_device.c arduino/arduino_interface.h
arduino/arduino_prober.c arduino/arduino_prober.c
) )
target_link_libraries(drv_arduino PRIVATE xrt-interfaces aux_util aux_os) target_link_libraries(drv_arduino PRIVATE xrt-interfaces aux_util aux_os aux_os_ble)
list(APPEND ENABLED_DRIVERS arduino) list(APPEND ENABLED_DRIVERS arduino)
endif() endif()
@ -26,7 +26,7 @@ if(XRT_BUILD_DRIVER_DAYDREAM)
drv_daydream STATIC daydream/daydream_device.c daydream/daydream_device.h drv_daydream STATIC daydream/daydream_device.c daydream/daydream_device.h
daydream/daydream_interface.h daydream/daydream_prober.c daydream/daydream_interface.h daydream/daydream_prober.c
) )
target_link_libraries(drv_daydream PRIVATE xrt-interfaces aux_util aux_os) target_link_libraries(drv_daydream PRIVATE xrt-interfaces aux_util aux_os aux_os_ble)
list(APPEND ENABLED_DRIVERS daydream) list(APPEND ENABLED_DRIVERS daydream)
endif() endif()