From bf4d8786cb732d86db333b43020ecf0af27f60bf Mon Sep 17 00:00:00 2001 From: Xerxes Rånby Date: Wed, 12 Aug 2015 14:56:26 +0200 Subject: Bug 1145: Fix cc1 NativeLibrary: Add current working directory + natives/os-arch/ + library names Fixes Bug 1145 cc1 when using an unpacked fat-jar --- src/java/com/jogamp/common/os/NativeLibrary.java | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/java/com/jogamp/common/os/NativeLibrary.java') 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++) { -- cgit v1.2.3