diff options
| author | Sven Gothel <[email protected]> | 2019-03-30 01:24:14 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2019-03-30 01:24:14 +0100 |
| commit | 03bcef96e3105923ccc8c827b70b97ff0aa3464c (patch) | |
| tree | 4caacb595238611501ee4df96930811edde431ae /make/build.xml | |
| parent | 179c88fcc547f965cb5fdce2b03f4faa776871ac (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.xml')
| -rw-r--r-- | make/build.xml | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/make/build.xml b/make/build.xml index 77a0ec0..dc6602f 100644 --- a/make/build.xml +++ b/make/build.xml @@ -413,8 +413,7 @@ </target> <target name="c.rename.lib.macosx" if="isOSX"> - <move file="${build}/obj/libgluegen-rt.dylib" tofile="${build}/obj/libgluegen-rt.jnilib" /> - <copy file="${build}/obj/libgluegen-rt.jnilib" tofile="${build}/obj/libgluegen-rt.so" /> + <copy file="${build}/obj/libgluegen-rt.dylib" tofile="${build}/obj/libgluegen-rt.so" /> </target> <target name="c.manifest" if="isVC8Family"> @@ -429,7 +428,7 @@ <property name="output.lib.name" value="gluegen-rt" /> <condition property="output.lib.name.os" value="lib${output.lib.name}.so"><isset property="isUnix"/></condition> <condition property="output.lib.name.os" value="${output.lib.name}.dll"><isset property="isWindows"/></condition> - <condition property="output.lib.name.os" value="lib${output.lib.name}.jnilib"><isset property="isOSX"/></condition> + <condition property="output.lib.name.os" value="lib${output.lib.name}.dylib"><isset property="isOSX"/></condition> <uptodate property="gluegen.build.skip.c"> <srcfiles dir= "${project.root}" includes="${c.compiler.src.files.os}"/> |