Bug 1145: Fix cc1 NativeLibrary: Add current working directory + nati…

…ves/os-arch/ + library names Fixes Bug 1145 cc1 when using an unpacked fat-jar
sgothel · Aug 12, 2015 · bf4d878 · bf4d878
1 parent 961e021
commit bf4d878
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/java/com/jogamp/common/os/NativeLibrary.java b/src/java/com/jogamp/common/os/NativeLibrary.java
@@ -453,6 +453,10 @@ public String run() {
         });
     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++) {