TheCloud/Amethyst-Android
1
0
Fork 0
mirror of https://github.com/AngelAuraMC/Amethyst-Android.git synced 2025-09-17 08:35:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename libgl04es to libgl4es_114

Browse Source
This commit is contained in:
khanhduytran0 2021-02-16 07:06:32 +07:00
parent f0a5a88f14
commit 614e56edcb
7 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/Tools.java
View File

@ -149,7 +149,7 @@ public final class Tools
// javaArgList.add("-Dorg.lwjgl.libname=liblwjgl3.so"); // javaArgList.add("-Dorg.lwjgl.libname=liblwjgl3.so");
// javaArgList.add("-Dorg.lwjgl.system.jemalloc.libname=libjemalloc.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"); // overrideableArgList.add("-Dorg.lwjgl.opengl.libname=libgl4es_115.so");
// javaArgList.add("-Dorg.lwjgl.opengl.libname=libRegal.so"); // javaArgList.add("-Dorg.lwjgl.opengl.libname=libRegal.so");

2
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/LauncherPreferences.java
View File

@ -20,7 +20,7 @@ public class LauncherPreferences
public static int PREF_LONGPRESS_TRIGGER = 500; public static int PREF_LONGPRESS_TRIGGER = 500;
public static String PREF_DEFAULTCTRL_PATH = Tools.CTRLDEF_FILE; public static String PREF_DEFAULTCTRL_PATH = Tools.CTRLDEF_FILE;
public static String PREF_CUSTOM_JAVA_ARGS; 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 String PREF_LANGUAGE = "default";
public static boolean PREF_CHECK_LIBRARY_SHA = true; public static boolean PREF_CHECK_LIBRARY_SHA = true;
public static boolean PREF_DISABLE_GESTURES = false; public static boolean PREF_DISABLE_GESTURES = false;

6
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/utils/JREUtils.java
View File

@ -77,12 +77,12 @@ public class JREUtils
} }
dlopen(nativeLibDir + "/libopenal.so"); dlopen(nativeLibDir + "/libopenal.so");
if (LauncherPreferences.PREF_CUSTOM_OPENGL_LIBNAME.equals("libgl04es.so")) { if (LauncherPreferences.PREF_CUSTOM_OPENGL_LIBNAME.equals("libgl4es_114.so")) {
LauncherPreferences.PREF_CUSTOM_OPENGL_LIBNAME = nativeLibDir + "/libgl04es.so"; LauncherPreferences.PREF_CUSTOM_OPENGL_LIBNAME = nativeLibDir + "/libgl4es_114.so";
} }
if (!dlopen(LauncherPreferences.PREF_CUSTOM_OPENGL_LIBNAME) && !dlopen(findInLdLibPath(LauncherPreferences.PREF_CUSTOM_OPENGL_LIBNAME))) { 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."); 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");
} }
} }

0
app_pojavlauncher/src/main/jniLibs/arm64-v8a/libgl04es.so → app_pojavlauncher/src/main/jniLibs/arm64-v8a/libgl4es_114.so
View File

0
app_pojavlauncher/src/main/jniLibs/armeabi-v7a/libgl04es.so → app_pojavlauncher/src/main/jniLibs/armeabi-v7a/libgl4es_114.so
View File

0
app_pojavlauncher/src/main/jniLibs/x86/libgl04es.so → app_pojavlauncher/src/main/jniLibs/x86/libgl4es_114.so
View File

0
app_pojavlauncher/src/main/jniLibs/x86_64/libgl04es.so → app_pojavlauncher/src/main/jniLibs/x86_64/libgl4es_114.so
View File