From 137974c5edbf994504d702e228a9164b86c352ff Mon Sep 17 00:00:00 2001 From: Marvin Scholz Date: Tue, 12 Nov 2019 12:49:49 +0100 Subject: [PATCH] bdj: add additional jli paths for macOS --- src/libbluray/bdj/bdj.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/libbluray/bdj/bdj.c b/src/libbluray/bdj/bdj.c index c8ad3d1c..b460223f 100644 --- a/src/libbluray/bdj/bdj.c +++ b/src/libbluray/bdj/bdj.c @@ -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; }