From 546c7c93b162f6ebe9c0a59228ffa00a057fbf40 Mon Sep 17 00:00:00 2001 From: bjorn Date: Mon, 21 Mar 2022 12:02:17 -0700 Subject: [PATCH] Make OpenXR the default driver built by CMake; --- CMakeLists.txt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 52cf2f74..98b3e979 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,8 +16,8 @@ option(LOVR_ENABLE_THREAD "Enable the thread module" ON) option(LOVR_ENABLE_TIMER "Enable the timer module" ON) option(LOVR_USE_LUAJIT "Use LuaJIT instead of Lua" ON) -option(LOVR_USE_OPENVR "Enable the OpenVR backend for the headset module" ON) -option(LOVR_USE_OPENXR "Enable the OpenXR backend for the headset module" OFF) +option(LOVR_USE_OPENVR "Enable the OpenVR backend for the headset module" OFF) +option(LOVR_USE_OPENXR "Enable the OpenXR backend for the headset module" ON) option(LOVR_USE_WEBXR "Enable the WebXR 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_VRAPI "Enable the VrApi backend for the headset module" OFF) @@ -60,7 +60,6 @@ if(EMSCRIPTEN) set(LOVR_USE_OPENVR OFF) elseif(ANDROID) find_package(Java REQUIRED) - set(LOVR_USE_OPENVR OFF) set(LOVR_USE_DESKTOP OFF) if(LOVR_BUILD_EXE) set(LOVR_BUILD_SHARED ON) @@ -726,7 +725,6 @@ elseif(ANDROID) # - Figure out which Java class (Activity) and AndroidManifest.xml to use # - Oculus uses the regular android os layer, pico implements its own in the headset backend # - Some of the Pico SDK is in a jar that has to be added to the classpath and d8 invocation - # TODO error (probably way earlier) if no headset API is defined, since everything will break if(LOVR_USE_OPENXR) set(MANIFEST "oculus") set(ACTIVITY "openxr")