Skip to content

Commit

Permalink
Revert "Yep."
Browse files Browse the repository at this point in the history
This reverts commit a75ba60.
  • Loading branch information
The Judge committed May 20, 2024
1 parent 08f8e7f commit c8cd155
Show file tree
Hide file tree
Showing 20 changed files with 50,117 additions and 8 deletions.
2 changes: 1 addition & 1 deletion src/main/java/pojlib/util/JREUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ public static void setJavaEnvironment(Activity activity, MinecraftInstances.Inst
envMap.put("HOME", instance.gameDir);
envMap.put("TMPDIR", activity.getCacheDir().getAbsolutePath());
envMap.put("VR_MODEL", API_V1.model);
envMap.put("POJLIB_RENDERER", "tinywrapper");
envMap.put("POJLIB_RENDERER", "regal");

envMap.put("LD_LIBRARY_PATH", LD_LIBRARY_PATH);
envMap.put("PATH", activity.getFilesDir() + "/runtimes/JRE-21/bin:" + Os.getenv("PATH"));
Expand Down
25 changes: 22 additions & 3 deletions src/main/jni/Android.mk
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,29 @@ HERE_PATH := $(LOCAL_PATH)
LOCAL_PATH := $(HERE_PATH)

include $(CLEAR_VARS)
LOCAL_MODULE := tinywrapper
LOCAL_SRC_FILES := GL/libtinywrapper.so
LOCAL_MODULE := regal
LOCAL_SRC_FILES := GL/libRegal.so
include $(PREBUILT_SHARED_LIBRARY)

include $(CLEAR_VARS)
LOCAL_MODULE := spirv-cross
LOCAL_SRC_FILES := tinywrapper/SPIRVCross/libspirv-cross-c-shared.so
include $(PREBUILT_SHARED_LIBRARY)

include $(CLEAR_VARS)
LOCAL_MODULE := shaderc
LOCAL_SRC_FILES := tinywrapper/shaderc/libshaderc_shared.so
include $(PREBUILT_SHARED_LIBRARY)

include $(CLEAR_VARS)
LOCAL_MODULE := tinywrapper
LOCAL_SHARED_LIBRARIES := regal spirv-cross shaderc
LOCAL_LDLIBS := -lGLESv3
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
Expand Down Expand Up @@ -50,7 +69,7 @@ LOCAL_LDLIBS := -ldl -llog -landroid -lGLESv3 -lEGL
# -lGLESv2
LOCAL_MODULE := pojavexec
# LOCAL_CFLAGS += -DDEBUG
LOCAL_SHARED_LIBRARIES := openvr_api tinywrapper
LOCAL_SHARED_LIBRARIES := openvr_api regal
# -DGLES_TEST
LOCAL_SRC_FILES := \
egl_bridge.c \
Expand Down
Loading

0 comments on commit c8cd155

Please sign in to comment.