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

rm oculus openxr loader; 

As of v51, Quest works with the official OpenXR loader.
This commit is contained in:
bjorn 2023-05-04 18:29:39 -07:00
parent 0bb16d24ef
commit 211c29e8c2
4 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -16,9 +16,6 @@
[submodule "deps/openxr"]
path = deps/openxr
url = https://github.com/khronosgroup/openxr-sdk
[submodule "deps/oculus-openxr"]
path = deps/oculus-openxr
url = https://github.com/lovr-org/ovr_openxr_mobile_sdk
[submodule "deps/glslang"]
path = deps/glslang
url = https://github.com/bjornbytes/glslang

5
CMakeLists.txt
View File

@ -754,11 +754,6 @@ elseif(ANDROID)
configure_file(${PICO_LOADER} "raw/lib/${ANDROID_ABI}/libopenxr_loader_pico.so" COPYONLY)
endif()
set(OCULUS_LOADER "${CMAKE_CURRENT_SOURCE_DIR}/deps/oculus-openxr/Libs/Android/${ANDROID_ABI}/Release/libopenxr_loader.so")
if(EXISTS ${OCULUS_LOADER})
configure_file(${OCULUS_LOADER} "raw/lib/${ANDROID_ABI}/libopenxr_loader_oculus.so" COPYONLY)
endif()
configure_file("${ANDROID_NDK}/toolchains/llvm/prebuilt/${ANDROID_HOST_TAG}/sysroot/usr/lib/aarch64-linux-android/libc++_shared.so" "raw/lib/${ANDROID_ABI}/libc++_shared.so" COPYONLY)
endif()

1
deps/oculus-openxr vendored

@ -1 +0,0 @@
Subproject commit 56205f0f2c3358896fdb5c8da87736bf0f20705d

5
etc/Activity.java
View File

@ -8,10 +8,7 @@ import android.os.Build;
public class Activity extends NativeActivity {
static {
if (Build.MANUFACTURER.contains("Oculus")) {
Log.d("LOVR", "Using Oculus OpenXR Loader");
System.loadLibrary("openxr_loader_oculus");
} else if (Build.MANUFACTURER.contains("Pico")) {
if (Build.MANUFACTURER.contains("Pico")) {
Log.d("LOVR", "Using Pico OpenXR Loader");
System.loadLibrary("openxr_loader_pico");
} else {