LAV
/
libbluray
1
0
Fork 0
Code

bdj: add additional jli paths for macOS

This commit is contained in:
Marvin Scholz 2019-11-12 12:49:49 +01:00
parent 406a430213
commit 137974c5ed
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/libbluray/bdj/bdj.c
View File

@ -343,19 +343,23 @@ static void *_jvm_dlopen_a(const char *java_home,
static void *_load_jli_macos()
{
const char *java_home = NULL;
static const char jli_dir[] = "jre/lib/jli";
static const char * const jli_dir[] = {
"jre/lib/jli", "lib/jli",
};
const unsigned num_jli_dir = sizeof(jli_dir) / sizeof(jli_dir[0]);
static const char jli_lib[] = "libjli";
void *handle;
/* JAVA_HOME set, use it */
java_home = getenv("JAVA_HOME");
if (java_home) {
return _jvm_dlopen(java_home, jli_dir, jli_lib);
return _jvm_dlopen_a(java_home, jli_dir, num_jli_dir, jli_lib);
}
java_home = _java_home_macos();
if (java_home) {
handle = _jvm_dlopen(java_home, jli_dir, jli_lib);
handle = _jvm_dlopen_a(java_home, jli_dir, num_jli_dir, jli_lib);
if (handle) {
return handle;
}