diff --git a/java/README b/java/README index 88ddc3bd..5af1e31d 100644 --- a/java/README +++ b/java/README @@ -38,7 +38,7 @@ Installation Directory ---------------------- The TurboJPEG Java Wrapper will look for the TurboJPEG JNI library -(libturbojpeg.so, libturbojpeg.jnilib, or turbojpeg.dll) in the system library +(libturbojpeg.so, libturbojpeg.dylib, or turbojpeg.dll) in the system library paths or in any paths specified in LD_LIBRARY_PATH (Un*x), DYLD_LIBRARY_PATH (Mac), or PATH (Windows.) Failing this, on Un*x and Mac systems, the wrapper will look for the JNI library under the library directory configured when diff --git a/java/org/libjpegturbo/turbojpeg/TJLoader-unix.java.in b/java/org/libjpegturbo/turbojpeg/TJLoader-unix.java.in index 65884e8d..d8cc4950 100644 --- a/java/org/libjpegturbo/turbojpeg/TJLoader-unix.java.in +++ b/java/org/libjpegturbo/turbojpeg/TJLoader-unix.java.in @@ -1,5 +1,5 @@ /* - * Copyright (C)2011-2013, 2016 D. R. Commander. All Rights Reserved. + * Copyright (C)2011-2013, 2016, 2020 D. R. Commander. All Rights Reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: @@ -36,9 +36,9 @@ final class TJLoader { String os = System.getProperty("os.name").toLowerCase(); if (os.indexOf("mac") >= 0) { try { - System.load("@CMAKE_INSTALL_FULL_LIBDIR@/libturbojpeg.jnilib"); + System.load("@CMAKE_INSTALL_FULL_LIBDIR@/libturbojpeg.dylib"); } catch (java.lang.UnsatisfiedLinkError e2) { - System.load("/usr/lib/libturbojpeg.jnilib"); + System.load("/usr/lib/libturbojpeg.dylib"); } } else { try { diff --git a/release/makemacpkg.in b/release/makemacpkg.in index c2a00933..bfe412d0 100644 --- a/release/makemacpkg.in +++ b/release/makemacpkg.in @@ -166,9 +166,6 @@ fi install_name_tool -id $LIBDIR/$LIBJPEG_DSO_NAME $PKGROOT/$LIBDIR/$LIBJPEG_DSO_NAME install_name_tool -id $LIBDIR/$TURBOJPEG_DSO_NAME $PKGROOT/$LIBDIR/$TURBOJPEG_DSO_NAME -if [ $WITH_JAVA = 1 ]; then - ln -fs $TURBOJPEG_DSO_NAME $PKGROOT/$LIBDIR/libturbojpeg.jnilib -fi if [ "$PREFIX" = "@CMAKE_INSTALL_DEFAULT_PREFIX@" -a "$LIBDIR" = "@CMAKE_INSTALL_DEFAULT_PREFIX@/lib" ]; then if [ ! -h $PKGROOT/$PREFIX/lib32 ]; then ln -fs lib $PKGROOT/$PREFIX/lib32