diff options
author | Tor Lillqvist <tml@collabora.com> | 2014-08-07 23:26:10 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2014-08-10 10:08:35 +0300 |
commit | 6ac523554213f11838443de0cd9b62415f5d2ffd (patch) | |
tree | 40b8046ffaf6810b6e949b55f464778caf3c442c /jurt/com | |
parent | e24d3ff2cd9e2da4c81105d2e9dbee6187fac55f (diff) |
Make this work better in the ENABLE_MACOSX_MACLIKE_APP_STRUCTURE case
In that case the dylibs won't be in the parent directory of where the
jars are (Resources), but in Frameworks.
Change-Id: I628d828ca820d07724947050f54f9f5f9148e159
Diffstat (limited to 'jurt/com')
-rw-r--r-- | jurt/com/sun/star/lib/util/NativeLibraryLoader.java | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/jurt/com/sun/star/lib/util/NativeLibraryLoader.java b/jurt/com/sun/star/lib/util/NativeLibraryLoader.java index c6c4c014a536..50b1f0559291 100644 --- a/jurt/com/sun/star/lib/util/NativeLibraryLoader.java +++ b/jurt/com/sun/star/lib/util/NativeLibraryLoader.java @@ -106,6 +106,16 @@ public final class NativeLibraryLoader { if (path.exists()) { return path; } + // In case of ENABLE_MACOSX_MACLIKE_APP_STRUCTURE, + // dir is now the Resources dir, we want to look in Frameworks + if (System.getProperty("os.name").startsWith("Mac") + && dir.getName().equals("Resources")) { + dir = dir.getParentFile(); + path = new File(dir, "Frameworks/" + name); + if (path.exists()) { + return path; + } + } } } } |