diff options
| author | Xerxes Rånby <[email protected]> | 2015-08-12 14:56:26 +0200 |
|---|---|---|
| committer | Xerxes Rånby <[email protected]> | 2015-08-12 14:56:26 +0200 |
| commit | bf4d8786cb732d86db333b43020ecf0af27f60bf (patch) | |
| tree | d7dae9566642e0a6533ea9ce4785aa27b091948f /src/java/com/jogamp/common/os | |
| parent | 961e021ea528aea89129cab4289df4406b24e8b1 (diff) | |
Bug 1145: Fix cc1 NativeLibrary: Add current working directory + natives/os-arch/ + library names
Fixes Bug 1145 cc1 when using an unpacked fat-jar
Diffstat (limited to 'src/java/com/jogamp/common/os')
| -rw-r--r-- | src/java/com/jogamp/common/os/NativeLibrary.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/java/com/jogamp/common/os/NativeLibrary.java b/src/java/com/jogamp/common/os/NativeLibrary.java index 747f92d..dc5af6d 100644 --- a/src/java/com/jogamp/common/os/NativeLibrary.java +++ b/src/java/com/jogamp/common/os/NativeLibrary.java @@ -453,6 +453,10 @@ public final class NativeLibrary implements DynamicLookupHelper { }); addPaths(userDir, baseNames, paths); + // Add current working directory + natives/os-arch/ + library names + // to handle Bug 1145 cc1 using an unpacked fat-jar + addPaths(userDir+File.separator+"natives"+File.separator+PlatformPropsImpl.os_and_arch+File.separator, baseNames, paths); + if (!searchSystemPathFirst) { // Add just the library names to use the OS's search algorithm for (int i = 0; i < baseNames.length; i++) { |