diff options
Diffstat (limited to 'make/build-nativewindow.xml')
| -rw-r--r-- | make/build-nativewindow.xml | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml index b4d7858a7..551f92ac8 100644 --- a/make/build-nativewindow.xml +++ b/make/build-nativewindow.xml @@ -616,10 +616,6 @@ <move file="${src}" tofile="${dest}" /> </target> - <target name="rename.dylib" if="isOSX"> - <move file="${src}" tofile="${dest}" /> - </target> - <macrodef name="c.build"> <attribute name="c.compiler.src.files" /> <attribute name="compiler.cfg.id" /> @@ -688,7 +684,7 @@ <targetfiles> <fileset dir="${obj.nativewindow}" includes="lib@{output.lib.name}.so"/> <fileset dir="${obj.nativewindow}" includes="@{output.lib.name}.dll"/> - <fileset dir="${obj.nativewindow}" includes="lib@{output.lib.name}.jnilib"/> + <fileset dir="${obj.nativewindow}" includes="lib@{output.lib.name}.dylib"/> </targetfiles> <sequential> <cc outtype="shared" @@ -728,14 +724,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.nativewindow}/lib@{output.lib.name}.dylib" /> - <param name="dest" value="${obj.nativewindow}/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.nativewindow}/lib@{output.lib.name}.so" /> <param name="dest" value="${obj.nativewindow}/@{output.lib.name}.dll" /> |