ryan/mozjpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Java/Mac:Remove obsolete libturbojpeg.jnilib alias

Browse Source 
IIRC, this was only necessary with the version of Java 1.5 that shipped
with OS X 10.4 "Tiger".  Apple's implementation of Java 6 ("Java for
OS X Systems") supported both .jnilib and .dylib extensions for JNI
libraries, but Oracle's implementation of Java has only ever supported
the .dylib extension.
This commit is contained in:
DRC
2020-06-25 21:31:11 -05:00
parent c77783ed41
commit fb6f5e8b01
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
java/org/libjpegturbo/turbojpeg/TJLoader-unix.java.in
View File

@@ -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 {