diff options
Diffstat (limited to 'make/build-oculusvr.xml')
| -rw-r--r-- | make/build-oculusvr.xml | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/make/build-oculusvr.xml b/make/build-oculusvr.xml index b89b66fb7..2fa7b16fa 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 --> @@ -637,7 +633,7 @@ <syslibset libs="ws2_32" if="isWindows"/> <syslibset libs="X11 Xrandr udev m" if="isLinux" unless="isLinuxARMv6" /> - <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" + <syslibset dir="${TARGET_PLATFORM_USRLIBS}" libs="X11 Xrandr udev m" if="isLinuxARMv6" /> <syslibset dir="/usr/local/lib" libs="X11 Xrandr udev m" if="isFreeBSD"/> @@ -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" /> |