LAV
/
libbluray
1
0
Fork 0
Code

Add support for compiling BD-J with OpenJDK 12 / 13

This commit is contained in:
hpi1 2020-02-16 17:15:44 +02:00
parent 0529106337
commit e670de413f
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.am
View File

@ -228,11 +228,15 @@ pkginclude_HEADERS = \
if USING_BDJAVA_BUILD_JAR
if USING_JAVAC_12
java_versions = -Djava_version_asm=1.7 -Djava_version_bdj=1.7
else
if USING_JAVAC_9
java_versions = -Djava_version_asm=1.6 -Djava_version_bdj=1.6
else
java_versions = -Djava_version_asm=1.5 -Djava_version_bdj=1.4
endif
endif
if BDJ_J2SE
awt_src = java-$(BDJ_TYPE):java-build-support

5
configure.ac
View File

@ -251,16 +251,19 @@ AS_IF([test "x$use_bdjava_jar" = "xyes"], [
dnl check for Java 9+
javac_version=`"$JAVAC" -version 2>&1 | head -n 1`
[with_java9=`echo "$javac_version" | grep -E -q '^javac\ (9|1[0-9])' && echo yes`]
[with_java9=`echo "$javac_version" | grep -E -q '^javac\ (9|1[0-1])' && echo yes`]
[with_java12=`echo "$javac_version" | grep -E -q '^javac\ (1[2-9])' && echo yes`]
])
AS_IF([test "x$with_java9" = "xyes" -a "$BDJ_TYPE" != "j2me"], [java_code_version=1.6], [java_code_version=1.4])
AS_IF([test "x$with_java12" = "xyes" -a "$BDJ_TYPE" != "j2me"], [java_code_version=1.7])
])
AC_DEFINE_UNQUOTED([JAVA_ARCH], ["$java_arch"], ["Defines the architecture of the java vm."])
AC_DEFINE_UNQUOTED([JDK_HOME], ["$JDK_HOME"], [""])
AM_CONDITIONAL([USING_BDJAVA_BUILD_JAR], [ test $use_bdjava_jar = "yes" ])
AM_CONDITIONAL([USING_JAVAC_9], [ test x"$with_java9" = x"yes" ])
AM_CONDITIONAL([USING_JAVAC_12], [ test x"$with_java12" = x"yes" ])
dnl BD-J type
if test "$BDJ_TYPE" = "j2me"; then