Remove OpenComposite

QuestCraftPlusPlus · Oct 9, 2024 · b594c37 · b594c37
1 parent 409ee97
commit b594c37
Show file tree

Hide file tree

Showing 17 changed files with 8 additions and 16,928 deletions.
diff --git a/src/main/assets/lwjgl/version b/src/main/assets/lwjgl/version
@@ -1 +1 @@
-1728269572443
+1728465869857
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
@@ -7,28 +7,6 @@ HERE_PATH := $(LOCAL_PATH)
 
 LOCAL_PATH := $(HERE_PATH)
 
-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)
 # Link GLESv2 for test
 LOCAL_LDLIBS := -ldl -llog -landroid -lGLESv3 -lEGL
@@ -46,10 +24,7 @@ include $(BUILD_SHARED_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 pojavexec
-LOCAL_WHOLE_STATIC_LIBRARIES := ocovr
-LOCAL_MODULE := openvr_api
+LOCAL_MODULE := vloader
 LOCAL_SRC_FILES := \
             vloader.cpp
 include $(BUILD_SHARED_LIBRARY)

diff --git a/src/main/jni/OpenOVR/OCOVR.a b/src/main/jni/OpenOVR/OCOVR.a
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