[libbluray-devel] [Git][videolan/libbluray][master] Win32: fix Java8 loading of classes

[Jean-Baptiste Kempf]

Jean-Baptiste Kempf pushed to branch master at VideoLAN / libbluray


Commits:
1be45382 by Jean-Baptiste Kempf at 2019-03-22T17:39:31Z
Win32: fix Java8 loading of classes

Indeed, on Windows, the separator for Xbootclasspath/p format is
";" and not ":"

- - - - -


1 changed file:

- src/libbluray/bdj/bdj.c


Changes:

=====================================
src/libbluray/bdj/bdj.c
=====================================
@@ -875,9 +875,15 @@ static int _create_jvm(void *jvm_lib, const char *java_home, const char *jar_fil
     option[n++].optionString = str_dup   ("-XfullShutdown");
 #endif
 
+#ifdef _WIN32
+# define CLASSPATH_FORMAT_P "%s;%s"
+#else
+# define CLASSPATH_FORMAT_P "%s:%s"
+#endif
+
     if (!java_9) {
       option[n++].optionString = str_dup   ("-Djavax.accessibility.assistive_technologies= ");
-      option[n++].optionString = str_printf("-Xbootclasspath/p:%s:%s", jar_file[0], jar_file[1]);
+      option[n++].optionString = str_printf("-Xbootclasspath/p:" CLASSPATH_FORMAT_P, jar_file[0], jar_file[1]);
     } else {
       option[n++].optionString = str_printf("--patch-module=java.base=%s", jar_file[0]);
       option[n++].optionString = str_printf("--patch-module=java.desktop=%s", jar_file[1]);



View it on GitLab: https://code.videolan.org/videolan/libbluray/commit/1be453824bb3b0fa3dc880d20cad21575672a930

-- 
View it on GitLab: https://code.videolan.org/videolan/libbluray/commit/1be453824bb3b0fa3dc880d20cad21575672a930
You're receiving this email because of your account on code.videolan.org.