From aa1d33669ce8d3fbf8ef7059779c0c71ec48d360 Mon Sep 17 00:00:00 2001 From: bjorn Date: Mon, 29 Apr 2019 21:54:19 -0700 Subject: [PATCH] Just use leap; --- CMakeLists.txt | 10 +++++----- src/headset/headset.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 950d5214..3aa860e9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,7 +23,7 @@ option(LOVR_USE_WEBVR "Enable the WebVR backend for the headset module" OFF) option(LOVR_USE_OCULUS "Enable the LibOVR backend for the headset module (be sure to also set LOVR_OCULUS_PATH to point to the Oculus SDK)" OFF) option(LOVR_USE_OCULUS_MOBILE "Enable the Oculus Mobile (Android) backend for the headset module" OFF) option(LOVR_USE_DESKTOP_HEADSET "Enable the keyboard/mouse backend for the headset module" ON) -option(LOVR_USE_LEAP_MOTION "Enable the Leap Motion backend for the headset module" ON) +option(LOVR_USE_LEAP "Enable the Leap Motion backend for the headset module" ON) option(LOVR_USE_SSE "Enable SIMD use of intrinsics" ON) option(LOVR_SYSTEM_PHYSFS "Use the system-provided PhysFS" OFF) @@ -272,9 +272,9 @@ if(LOVR_ENABLE_HEADSET AND LOVR_USE_OPENVR) endif() # Leap Motion -if(LOVR_ENABLE_HEADSET AND LOVR_USE_LEAP_MOTION) +if(LOVR_ENABLE_HEADSET AND LOVR_USE_LEAP) if(NOT LOVR_LEAP_PATH) - message(FATAL_ERROR "LOVR_USE_LEAP_MOTION requires the LOVR_LEAP_PATH to be set to the location of the Leap Motion SDK (LeapSDK) folder") + message(FATAL_ERROR "LOVR_USE_LEAP requires the LOVR_LEAP_PATH to be set to the location of the Leap Motion SDK (LeapSDK) folder") endif() if(CMAKE_SIZEOF_VOID_P EQUAL 8) set(LEAP_ARCH "x64") @@ -468,8 +468,8 @@ if(LOVR_ENABLE_HEADSET) add_definitions(-DLOVR_USE_DESKTOP_HEADSET) target_sources(lovr PRIVATE src/headset/desktop.c) endif() - if(LOVR_USE_LEAP_MOTION) - add_definitions(-DLOVR_USE_LEAP_MOTION) + if(LOVR_USE_LEAP) + add_definitions(-DLOVR_USE_LEAP) target_sources(lovr PRIVATE src/headset/leap.c) endif() endif() diff --git a/src/headset/headset.c b/src/headset/headset.c index 21e4d2dc..a0bdec74 100644 --- a/src/headset/headset.c +++ b/src/headset/headset.c @@ -18,7 +18,7 @@ bool lovrHeadsetInit(HeadsetDriver* drivers, int count, float offset, int msaa) #ifdef LOVR_USE_DESKTOP_HEADSET case DRIVER_DESKTOP: interface = &lovrHeadsetDesktopDriver; break; #endif -#ifdef LOVR_USE_LEAP_MOTION +#ifdef LOVR_USE_LEAP case DRIVER_LEAP_MOTION: interface = &lovrHeadsetLeapMotionDriver; break; #endif #ifdef LOVR_USE_OCULUS