strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make this work better in the ENABLE_MACOSX_MACLIKE_APP_STRUCTURE case

Browse source 
In that case the dylibs won't be in the parent directory of where the
jars are (Resources), but in Frameworks.

Change-Id: I628d828ca820d07724947050f54f9f5f9148e159
This commit is contained in:
Tor Lillqvist 2014-08-07 23:26:10 +03:00
parent e24d3ff2cd
commit 6ac5235542
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
jurt/com/sun/star/lib/util/NativeLibraryLoader.java
View file

@ -106,6 +106,16 @@ public final class NativeLibraryLoader {
if (path.exists()) { if (path.exists()) {
return path; 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;
}
}
} }
} }
} }