diff options
| author | Sven Gothel <[email protected]> | 2015-08-18 01:01:51 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2015-08-18 01:01:51 +0200 |
| commit | 63f11f7ef0a4c52187dc26e641f48e6a5c864815 (patch) | |
| tree | 38248c4d782231809071a14968b8890ef31cea77 /src | |
| parent | 3f73bbbd44721cc666e4d3505fcf163490636ba8 (diff) | |
| parent | bf4d8786cb732d86db333b43020ecf0af27f60bf (diff) | |
Merge branch 'bug1145' of https://github.com/xranby/gluegen
Diffstat (limited to 'src')
| -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++) { |