diff --git a/meson.build b/meson.build index 0546b2836ee56e0e53f32c29d66769b5d59daff6..2d8a5158bdd119cc53f003561d88031045d4c7fc 100644 --- a/meson.build +++ b/meson.build @@ -89,7 +89,7 @@ drivers = get_option('drivers') if 'ohmd' in drivers openhmd_required = true endif -if 'hdk' in drivers or 'psvr' in drivers +if 'psvr' in drivers hidapi_required = true endif if 'v4l2' in drivers @@ -97,7 +97,7 @@ if 'v4l2' in drivers endif if 'auto' in drivers - drivers += ['psmv', 'hydra'] + drivers += ['psmv', 'hydra', 'hdk'] endif 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 if 'psvr' not in drivers drivers += ['psvr'] endif - if 'hdk' not in drivers - drivers += ['hdk'] - endif endif if zlib.found() and ('auto' in drivers or 'vive' in drivers) diff --git a/src/xrt/drivers/meson.build b/src/xrt/drivers/meson.build index 4aa7df18a5d7834de8e56c1c4cea7492794f4b71..48837846e729082998fb663655aad2b6cbd76887 100644 --- a/src/xrt/drivers/meson.build +++ b/src/xrt/drivers/meson.build @@ -12,7 +12,7 @@ lib_drv_hdk = static_library( 'hdk/hdk_prober.c', ), include_directories: xrt_include, - dependencies: [aux, hidapi], + dependencies: [aux], build_by_default: 'hdk' in drivers, )