Change GL4ES_HOME to GL4ES_LIBNAME because yeah
This commit is contained in:
1 parent
186e3cfbb5
commit
1bb2fa0914
2 files changed
+8
-8
No files matched your search
@@ -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
|
||||
|
||||
@@ -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");
|
||||
|
||||
Reference in new issue
Block a user