diff options
| author | Sven Gothel <[email protected]> | 2019-03-30 01:27:37 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2019-03-30 01:27:37 +0100 |
| commit | b83a912f19685e81b71c950914f0f82cc0e534bf (patch) | |
| tree | 8857b151d3af9fe533d995bc8bc3224d0821bf40 /make/build-jogl.xml | |
| parent | ec4721c5b81ca39355f660294bf45edc0a1584da (diff) | |
Bug 1316: MacOSX: Keep *.dylib (Don't move to *.jnilib)
Since Java8 (or even earlier), JRE on OSX uses *.dylib native library suffix
instead of *.jnilib when automatically searching and loading them.
This is not easily being recognized by JogAmp, since we explicitly name
the native libraries with full path when testing with our TempJarCache.
Diffstat (limited to 'make/build-jogl.xml')
| -rw-r--r-- | make/build-jogl.xml | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/make/build-jogl.xml b/make/build-jogl.xml index 0f1b435c2..9faeae458 100644 --- a/make/build-jogl.xml +++ b/make/build-jogl.xml @@ -1435,10 +1435,6 @@ <move file="${src}" tofile="${dest}" /> </target> - <target name="rename.dylib" if="isOSX"> - <move file="${src}" tofile="${dest}" /> - </target> - <!-- Only compile the ffmpeg version depending source files against their respective header files! We do not use the resulting static libraries directly, @@ -1473,7 +1469,7 @@ <targetfiles> <fileset dir="${obj.joglsub}" includes="lib@{output.lib.name}.so"/> <fileset dir="${obj.joglsub}" includes="@{output.lib.name}.dll"/> - <fileset dir="${obj.joglsub}" includes="lib@{output.lib.name}.jnilib"/> + <fileset dir="${obj.joglsub}" includes="lib@{output.lib.name}.dylib"/> </targetfiles> <sequential> <cc outtype="shared" @@ -1595,7 +1591,7 @@ <targetfiles> <fileset dir="${obj.jogl}" includes="lib@{output.lib.name}.so"/> <fileset dir="${obj.jogl}" includes="@{output.lib.name}.dll"/> - <fileset dir="${obj.jogl}" includes="lib@{output.lib.name}.jnilib"/> + <fileset dir="${obj.jogl}" includes="lib@{output.lib.name}.dylib"/> </targetfiles> <sequential> <cc outtype="shared" @@ -1643,14 +1639,7 @@ </cc> <!-- FIXME: this is a hack; the cpptask should have an option to change the - suffix or at least understand the override from dylib to jnilib --> - <antcall target="rename.dylib" inheritRefs="true"> - <param name="src" value="${obj.jogl}/lib@{output.lib.name}.dylib" /> - <param name="dest" value="${obj.jogl}/lib@{output.lib.name}.jnilib" /> - </antcall> - - <!-- FIXME: this is a hack; the cpptask should have an option to change the - suffix or at least understand the override from dylib to jnilib --> + suffix or at least understand the override from so to dll --> <antcall target="rename.mingw.dll" inheritRefs="true"> <param name="src" value="${obj.jogl}/lib@{output.lib.name}.so" /> <param name="dest" value="${obj.jogl}/@{output.lib.name}.dll" /> |