From 1bb2fa091437ea4bf649eb5f8b3f71aa606ba0c2 Mon Sep 17 00:00:00 2001 From: doregon Date: Sun, 18 Jul 2021 19:53:28 -0400 Subject: [PATCH] Change GL4ES_HOME to GL4ES_LIBNAME because yeah --- Natives/JavaLauncher.m | 14 +++++++------- Natives/egl_bridge.m | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Natives/JavaLauncher.m b/Natives/JavaLauncher.m index 941498fc..861c5b7c 100644 --- a/Natives/JavaLauncher.m +++ b/Natives/JavaLauncher.m @@ -181,11 +181,11 @@ int launchJVM(int argc, char *argv[]) { debug("[Pre-init] JAVA_HOME environment variable not set. Defaulting to %s\n", javaHome); } - char *gl4esHome = getenv("GL4ES_HOME"); - if (!gl4esHome) { - gl4esHome = "libgl4es_114.dylib"; - setenv("GL4ES_HOME", gl4esHome, 1); - debug("[Pre-init] GL4ES_HOME environment variable not set. Defaulting to %s\n", gl4esHome); + char *gl4esLibname = getenv("GL4ES_LIBNAME"); + if (!gl4esLibname) { + gl4esLibname = "libgl4es_114.dylib"; + setenv("GL4ES_LIBNAME", gl4esLibname, 1); + debug("[Pre-init] GL4ES_LIBNAME environment variable not set. Defaulting to %s\n", gl4esLibname); } char controlPath[2048]; @@ -237,8 +237,8 @@ int launchJVM(int argc, char *argv[]) { init_loadCustomJvmFlags(); } else { - setenv("GL4ES_HOME", gl4esHome, 1); - debug("[Pre-init] OpenGL library name: %s", getenv("GL4ES_HOME")); + setenv("GL4ES_LIBNAME", gl4esLibname, 1); + debug("[Pre-init] OpenGL library name: %s", getenv("GL4ES_LIBNAME")); } // Load java diff --git a/Natives/egl_bridge.m b/Natives/egl_bridge.m index 200333c7..622ea84c 100644 --- a/Natives/egl_bridge.m +++ b/Natives/egl_bridge.m @@ -193,7 +193,7 @@ JNIEXPORT jboolean JNICALL Java_org_lwjgl_glfw_GLFW_nativeEglMakeCurrent(JNIEnv* debug("First frame error: %x", eglGetError()); #endif if (success == EGL_TRUE) { - GL4ES_HANDLE = dlopen(getenv("GL4ES_HOME"), RTLD_GLOBAL); + GL4ES_HANDLE = dlopen(getenv("GL4ES_LIBNAME"), RTLD_GLOBAL); debug("libGL=%p", GL4ES_HANDLE); gl4esInitialize_func *gl4esInitialize = (gl4esInitialize_func*) dlsym(GL4ES_HANDLE, "initialize_gl4es");