Vivecraft OpenXR

QuestCraftPlusPlus · Apr 20, 2024 · 61026fa · 61026fa
1 parent 5628805
commit 61026fa
Show file tree

Hide file tree

Showing 13 changed files with 33 additions and 7,573 deletions.
diff --git a/src/main/java/pojlib/util/VLoader.java b/src/main/java/pojlib/util/VLoader.java
@@ -5,7 +5,7 @@
 public class VLoader {
     static {
         System.loadLibrary("openxr_loader");
-        System.loadLibrary("openvr_api");
+        System.loadLibrary("vloader");
     }
 
     public static native void setAndroidInitInfo(Context ctx);

diff --git a/src/main/jni/Android.mk b/src/main/jni/Android.mk
@@ -1,4 +1,4 @@
-LOCAL_PATH := $(call my-dir)
+ LOCAL_PATH := $(call my-dir)
 HERE_PATH := $(LOCAL_PATH)
 
 # include $(HERE_PATH)/crash_dump/libbase/Android.mk
@@ -30,35 +30,9 @@ LOCAL_SRC_FILES := tinywrapper/main.c tinywrapper/string_utils.c
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/tinywrapper
 include $(BUILD_SHARED_LIBRARY)
 
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := openxr_loader
-LOCAL_SRC_FILES := libopenxr_loader.so
-include $(PREBUILT_SHARED_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := occore
-LOCAL_SRC_FILES := ./OpenOVR/libOCCore.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_SHARED_LIBRARIES := openxr_loader
-LOCAL_MODULE := drvopenxr
-LOCAL_SRC_FILES := ./OpenOVR/libDrvOpenXR.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := ocovr
-LOCAL_STATIC_LIBRARIES := drvopenxr occore drvopenxr
-LOCAL_SRC_FILES := ./OpenOVR/OCOVR.a
-include $(PREBUILT_STATIC_LIBRARY)
-
 include $(CLEAR_VARS)
 LOCAL_LDLIBS := -llog -landroid -lGLESv3 -lvulkan -lEGL
-LOCAL_CFLAGS := -DXR_USE_PLATFORM_ANDROID -DXR_USE_GRAPHICS_API_OPENGL_ES
-LOCAL_SHARED_LIBRARIES := openxr_loader
-LOCAL_WHOLE_STATIC_LIBRARIES := ocovr
-LOCAL_MODULE := openvr_api
+LOCAL_MODULE := vloader
         LOCAL_SRC_FILES := \
                     vloader.cpp
 include $(BUILD_SHARED_LIBRARY)
@@ -69,7 +43,7 @@ LOCAL_LDLIBS := -ldl -llog -landroid -lGLESv3 -lEGL
 # -lGLESv2
 LOCAL_MODULE := pojavexec
 # LOCAL_CFLAGS += -DDEBUG
-LOCAL_SHARED_LIBRARIES := openvr_api regal
+LOCAL_SHARED_LIBRARIES := regal
 # -DGLES_TEST
 LOCAL_SRC_FILES := \
     egl_bridge.c \

diff --git a/src/main/jni/OpenOVR/OCOVR.a b/src/main/jni/OpenOVR/OCOVR.a
diff --git a/src/main/jni/OpenOVR/android_api.h b/src/main/jni/OpenOVR/android_api.h
diff --git a/src/main/jni/OpenOVR/libDrvOpenXR.a b/src/main/jni/OpenOVR/libDrvOpenXR.a
diff --git a/src/main/jni/OpenOVR/libOCCore.a b/src/main/jni/OpenOVR/libOCCore.a
diff --git a/src/main/jni/OpenOVR/libOpenXR.a b/src/main/jni/OpenOVR/libOpenXR.a