Skip to content
Snippets Groups Projects
Commit 746cccca authored by Christoph Haag's avatar Christoph Haag
Browse files

meson: HDK driver does not depend on hidapi

parent dfd6691d
No related branches found
No related tags found
No related merge requests found
...@@ -89,7 +89,7 @@ drivers = get_option('drivers') ...@@ -89,7 +89,7 @@ drivers = get_option('drivers')
if 'ohmd' in drivers if 'ohmd' in drivers
openhmd_required = true openhmd_required = true
endif endif
if 'hdk' in drivers or 'psvr' in drivers if 'psvr' in drivers
hidapi_required = true hidapi_required = true
endif endif
if 'v4l2' in drivers if 'v4l2' in drivers
...@@ -97,7 +97,7 @@ if 'v4l2' in drivers ...@@ -97,7 +97,7 @@ if 'v4l2' in drivers
endif endif
if 'auto' in drivers if 'auto' in drivers
drivers += ['psmv', 'hydra'] drivers += ['psmv', 'hydra', 'hdk']
endif endif
openhmd = dependency('openhmd', required: openhmd_required) openhmd = dependency('openhmd', required: openhmd_required)
...@@ -114,9 +114,6 @@ if hidapi.found() and ('auto' in drivers or 'psvr' in drivers or 'hdk' in driver ...@@ -114,9 +114,6 @@ if hidapi.found() and ('auto' in drivers or 'psvr' in drivers or 'hdk' in driver
if 'psvr' not in drivers if 'psvr' not in drivers
drivers += ['psvr'] drivers += ['psvr']
endif endif
if 'hdk' not in drivers
drivers += ['hdk']
endif
endif endif
if zlib.found() and ('auto' in drivers or 'vive' in drivers) if zlib.found() and ('auto' in drivers or 'vive' in drivers)
......
...@@ -12,7 +12,7 @@ lib_drv_hdk = static_library( ...@@ -12,7 +12,7 @@ lib_drv_hdk = static_library(
'hdk/hdk_prober.c', 'hdk/hdk_prober.c',
), ),
include_directories: xrt_include, include_directories: xrt_include,
dependencies: [aux, hidapi], dependencies: [aux],
build_by_default: 'hdk' in drivers, build_by_default: 'hdk' in drivers,
) )
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment