diff options
| -rw-r--r-- | make/build-jogl.xml | 17 | ||||
| -rw-r--r-- | make/build-nativewindow.xml | 15 | ||||
| -rw-r--r-- | make/build-newt.xml | 15 | ||||
| -rw-r--r-- | make/build-oculusvr.xml | 15 |
4 files changed, 9 insertions, 53 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" /> 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" /> diff --git a/make/build-newt.xml b/make/build-newt.xml index 733d5aebd..f5db296f8 100644 --- a/make/build-newt.xml +++ b/make/build-newt.xml @@ -620,10 +620,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" /> @@ -672,7 +668,7 @@ <targetfiles> <fileset dir="${obj.newt}" includes="lib@{output.lib.name}.so"/> <fileset dir="${obj.newt}" includes="@{output.lib.name}.dll"/> - <fileset dir="${obj.newt}" includes="lib@{output.lib.name}.jnilib"/> + <fileset dir="${obj.newt}" includes="lib@{output.lib.name}.dylib"/> </targetfiles> <sequential> <cc outtype="shared" @@ -717,14 +713,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.newt}/lib@{output.lib.name}.dylib" /> - <param name="dest" value="${obj.newt}/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.newt}/lib@{output.lib.name}.so" /> <param name="dest" value="${obj.newt}/@{output.lib.name}.dll" /> diff --git a/make/build-oculusvr.xml b/make/build-oculusvr.xml index b89b66fb7..e66ec5b88 100644 --- a/make/build-oculusvr.xml +++ b/make/build-oculusvr.xml @@ -411,10 +411,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="compiler.cfg.id" /> <attribute name="linker.cfg.id" /> @@ -530,7 +526,7 @@ <targetfiles> <fileset dir="${obj.oculusvr}" includes="lib@{output.lib.name}.so"/> <fileset dir="${obj.oculusvr}" includes="@{output.lib.name}.dll"/> - <fileset dir="${obj.oculusvr}" includes="lib@{output.lib.name}.jnilib"/> + <fileset dir="${obj.oculusvr}" includes="lib@{output.lib.name}.dylib"/> </targetfiles> <sequential> <!-- C Compilation --> @@ -660,14 +656,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.oculusvr}/lib@{output.lib.name}.dylib" /> - <param name="dest" value="${obj.oculusvr}/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.oculusvr}/lib@{output.lib.name}.so" /> <param name="dest" value="${obj.oculusvr}/@{output.lib.name}.dll" /> |