diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/Tools.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/Tools.java index ad5a9aa16..04ee25169 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/Tools.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/Tools.java @@ -149,7 +149,7 @@ public final class Tools // javaArgList.add("-Dorg.lwjgl.libname=liblwjgl3.so"); // javaArgList.add("-Dorg.lwjgl.system.jemalloc.libname=libjemalloc.so"); - overrideableArgList.add("-Dorg.lwjgl.opengl.libname=libgl04es.so"); + overrideableArgList.add("-Dorg.lwjgl.opengl.libname=libgl4es_114.so"); // overrideableArgList.add("-Dorg.lwjgl.opengl.libname=libgl4es_115.so"); // javaArgList.add("-Dorg.lwjgl.opengl.libname=libRegal.so"); diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/LauncherPreferences.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/LauncherPreferences.java index 8dab04a77..16f3ea696 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/LauncherPreferences.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/LauncherPreferences.java @@ -20,7 +20,7 @@ public class LauncherPreferences public static int PREF_LONGPRESS_TRIGGER = 500; public static String PREF_DEFAULTCTRL_PATH = Tools.CTRLDEF_FILE; public static String PREF_CUSTOM_JAVA_ARGS; - public static String PREF_CUSTOM_OPENGL_LIBNAME = "libgl04es.so"; + public static String PREF_CUSTOM_OPENGL_LIBNAME = "libgl4es_114.so"; public static String PREF_LANGUAGE = "default"; public static boolean PREF_CHECK_LIBRARY_SHA = true; public static boolean PREF_DISABLE_GESTURES = false; diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/utils/JREUtils.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/utils/JREUtils.java index 578fb4460..a2a8bc7a7 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/utils/JREUtils.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/utils/JREUtils.java @@ -77,12 +77,12 @@ public class JREUtils } dlopen(nativeLibDir + "/libopenal.so"); - if (LauncherPreferences.PREF_CUSTOM_OPENGL_LIBNAME.equals("libgl04es.so")) { - LauncherPreferences.PREF_CUSTOM_OPENGL_LIBNAME = nativeLibDir + "/libgl04es.so"; + if (LauncherPreferences.PREF_CUSTOM_OPENGL_LIBNAME.equals("libgl4es_114.so")) { + LauncherPreferences.PREF_CUSTOM_OPENGL_LIBNAME = nativeLibDir + "/libgl4es_114.so"; } if (!dlopen(LauncherPreferences.PREF_CUSTOM_OPENGL_LIBNAME) && !dlopen(findInLdLibPath(LauncherPreferences.PREF_CUSTOM_OPENGL_LIBNAME))) { System.err.println("Failed to load custom OpenGL library " + LauncherPreferences.PREF_CUSTOM_OPENGL_LIBNAME + ". Fallbacking to GL4ES."); - dlopen(nativeLibDir + "/libgl04es.so"); + dlopen(nativeLibDir + "/libgl4es_114.so"); } } diff --git a/app_pojavlauncher/src/main/jniLibs/arm64-v8a/libgl04es.so b/app_pojavlauncher/src/main/jniLibs/arm64-v8a/libgl4es_114.so similarity index 100% rename from app_pojavlauncher/src/main/jniLibs/arm64-v8a/libgl04es.so rename to app_pojavlauncher/src/main/jniLibs/arm64-v8a/libgl4es_114.so diff --git a/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/libgl04es.so b/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/libgl4es_114.so similarity index 100% rename from app_pojavlauncher/src/main/jniLibs/armeabi-v7a/libgl04es.so rename to app_pojavlauncher/src/main/jniLibs/armeabi-v7a/libgl4es_114.so diff --git a/app_pojavlauncher/src/main/jniLibs/x86/libgl04es.so b/app_pojavlauncher/src/main/jniLibs/x86/libgl4es_114.so similarity index 100% rename from app_pojavlauncher/src/main/jniLibs/x86/libgl04es.so rename to app_pojavlauncher/src/main/jniLibs/x86/libgl4es_114.so diff --git a/app_pojavlauncher/src/main/jniLibs/x86_64/libgl04es.so b/app_pojavlauncher/src/main/jniLibs/x86_64/libgl4es_114.so similarity index 100% rename from app_pojavlauncher/src/main/jniLibs/x86_64/libgl04es.so rename to app_pojavlauncher/src/main/jniLibs/x86_64/libgl4es_114.so