diff options
| -rwxr-xr-x | make/gluegen-cpptasks-base.xml | 4 | ||||
| -rw-r--r-- | src/java/com/jogamp/common/os/NativeLibrary.java | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/make/gluegen-cpptasks-base.xml b/make/gluegen-cpptasks-base.xml index 1106241..01d6146 100755 --- a/make/gluegen-cpptasks-base.xml +++ b/make/gluegen-cpptasks-base.xml @@ -1655,7 +1655,9 @@ <mkdir dir="${nativejarfile.tmpdir}/java" /> <mkdir dir="${nativejarfile.tmpdir.natives}" /> - <copy todir="${nativejarfile.tmpdir.natives}"> + <mkdir dir="${nativejarfile.tmpdir.natives}/natives" /> + <mkdir dir="${nativejarfile.tmpdir.natives}/natives/${os.and.arch}" /> + <copy todir="${nativejarfile.tmpdir.natives}/natives/${os.and.arch}"> <fileset dir="@{objdir}" includes="@{includelibs}" excludes="@{excludelibs}"/> diff --git a/src/java/com/jogamp/common/os/NativeLibrary.java b/src/java/com/jogamp/common/os/NativeLibrary.java index af4a089..1570308 100644 --- a/src/java/com/jogamp/common/os/NativeLibrary.java +++ b/src/java/com/jogamp/common/os/NativeLibrary.java @@ -426,6 +426,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); + return paths; } |