lpnf
/
lovr
mirror of https://github.com/bjornbytes/lovr.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Just use leap;

This commit is contained in:
bjorn 2019-04-29 21:54:19 -07:00
parent e22d98e09e
commit aa1d33669c
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -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()

2
src/headset/headset.c
View File

@ -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