Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
blender
monado
Commits
dc29c3f9
Commit
dc29c3f9
authored
Oct 05, 2020
by
Christoph Haag
Committed by
Jakob Bornecrantz
Oct 05, 2020
Browse files
build/meson: Build daydream and arduino driver when dbus is enabled
parent
5bea856f
Changes
4
Hide whitespace changes
Inline
Side-by-side
meson.build
View file @
dc29c3f9
...
...
@@ -191,6 +191,16 @@ if survive.found() and ('survive' in drivers)
endif
endif
if not get_option('dbus').disabled() and dbus.found()
if 'daydream' not in drivers
drivers += ['daydream']
endif
if 'arduino' not in drivers
drivers += ['arduino']
endif
endif
if drivers.length() == 0 or drivers == ['auto']
error('You must enable at least one driver.')
endif
...
...
meson_options.txt
View file @
dc29c3f9
...
...
@@ -3,7 +3,7 @@
option('drivers',
type: 'array',
choices: ['auto', 'dummy', 'hdk', 'hydra', 'ns', 'ohmd', 'psmv', 'psvr', 'rs', 'v4l2', 'vive', 'survive'],
choices: ['auto', 'dummy', 'hdk', 'hydra', 'ns', 'ohmd', 'psmv', 'psvr', 'rs', 'v4l2', 'vive', 'survive'
, 'daydream', 'arduino'
],
value: ['auto'],
description: 'Set of drivers to build')
...
...
src/xrt/drivers/meson.build
View file @
dc29c3f9
...
...
@@ -156,3 +156,32 @@ lib_drv_survive = static_library(
dependencies: [aux, zlib, survive],
build_by_default: 'survive' in drivers,
)
lib_drv_daydream = static_library(
'drv_daydream',
files(
'daydream/daydream_device.c',
'daydream/daydream_device.h',
'daydream/daydream_interface.h',
'daydream/daydream_prober.c',
),
include_directories: [
xrt_include,
],
dependencies: [dbus, aux],
build_by_default: 'daydream' in drivers,
)
lib_drv_arduino = static_library(
'drv_arduino',
files(
'arduino/arduino_device.c',
'arduino/arduino_interface.h',
'arduino/arduino_prober.c',
),
include_directories: [
xrt_include,
],
dependencies: [dbus, aux],
build_by_default: 'arduino' in drivers,
)
src/xrt/targets/meson.build
View file @
dc29c3f9
...
...
@@ -57,6 +57,14 @@ if 'survive' in drivers
driver_libs += [lib_drv_survive]
endif
if 'daydream' in drivers
driver_libs += [lib_drv_daydream]
endif
if 'arduino' in drivers
driver_libs += [lib_drv_arduino]
endif
subdir('common')
subdir('openxr')
subdir('cli')
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment