From d645b58186d27b67cbe020e3b928e2b870bc2c09 Mon Sep 17 00:00:00 2001 From: Jakob Bornecrantz Date: Mon, 11 May 2020 14:34:53 +0100 Subject: [PATCH] meson: Tidy NorthStar driver selection code (NFC) --- meson.build | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/meson.build b/meson.build index d1559e04a..dc8a22b92 100644 --- a/meson.build +++ b/meson.build @@ -130,9 +130,6 @@ drivers = get_option('drivers') if 'ohmd' in drivers openhmd_required = true endif -if 'ns' in drivers - ns_required = true -endif if 'psvr' in drivers hidapi_required = true endif @@ -141,19 +138,13 @@ if 'v4l2' in drivers endif if 'auto' in drivers - drivers += ['dummy', 'hdk', 'hydra', 'psmv'] + drivers += ['dummy', 'hdk', 'hydra', 'ns', 'psmv'] endif openhmd = dependency('openhmd', required: openhmd_required) hidapi = dependency('hidapi-libusb', required: hidapi_required) v4l2 = dependency('libv4l2', required: v4l2_required) -if 'auto' in drivers or 'ns' in drivers - if 'ns' not in drivers - drivers += ['ns'] - endif -endif - if openhmd.found() and ('auto' in drivers or 'ohmd' in drivers) if 'ohmd' not in drivers drivers += ['ohmd']