Attachment #807 for bug #1316

View | Details | Raw Unified | Return to bug 1316
Collapse All | Expand All




        <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,

          <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}.dylib"/>
          </targetfiles>
          <sequential>
            <cc outtype="shared" 

          <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}.dylib"/>
          </targetfiles>
          <sequential>
            <cc outtype="shared" 

    
            <!-- 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 -->
            <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" />




        <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" />

          <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}.dylib"/>
          </targetfiles>
          <sequential>
            <cc outtype="shared" 


            <!-- 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 -->
            <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" />




        <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" />

          <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}.dylib"/>
          </targetfiles>
          <sequential>
            <cc outtype="shared"

    
            <!-- 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 -->
            <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" />




        <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" />

          <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}.dylib"/>
          </targetfiles>
          <sequential>
            <!-- C Compilation -->

    
            <!-- 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 -->
            <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" />

Return to bug 1316

Lines 1435-1444 Link Here

(-)a/make/build-jogl.xml (-13 / +2 lines)
1435	<move file="${src}" tofile="${dest}" />	1435	<move file="${src}" tofile="${dest}" />
1436	</target>	1436	</target>
1437		1437
1438	<target name="rename.dylib" if="isOSX">
1439	<move file="${src}" tofile="${dest}" />
1440	</target>
1441
1442	<!-- Only compile the ffmpeg version depending source files	1438	<!-- Only compile the ffmpeg version depending source files
1443	against their respective header files!	1439	against their respective header files!
1444	We do not use the resulting static libraries directly,	1440	We do not use the resulting static libraries directly,
Lines 1473-1479 Link Here
1473	<targetfiles>	1469	<targetfiles>
1474	<fileset dir="${obj.joglsub}" includes="lib@{output.lib.name}.so"/>	1470	<fileset dir="${obj.joglsub}" includes="lib@{output.lib.name}.so"/>
1475	<fileset dir="${obj.joglsub}" includes="@{output.lib.name}.dll"/>	1471	<fileset dir="${obj.joglsub}" includes="@{output.lib.name}.dll"/>
1476	<fileset dir="${obj.joglsub}" includes="lib@{output.lib.name}.jnilib"/>	1472	<fileset dir="${obj.joglsub}" includes="lib@{output.lib.name}.dylib"/>
1477	</targetfiles>	1473	</targetfiles>
1478	<sequential>	1474	<sequential>
1479	<cc outtype="shared"	1475	<cc outtype="shared"
Lines 1595-1601 Link Here
1595	<targetfiles>	1591	<targetfiles>
1596	<fileset dir="${obj.jogl}" includes="lib@{output.lib.name}.so"/>	1592	<fileset dir="${obj.jogl}" includes="lib@{output.lib.name}.so"/>
1597	<fileset dir="${obj.jogl}" includes="@{output.lib.name}.dll"/>	1593	<fileset dir="${obj.jogl}" includes="@{output.lib.name}.dll"/>
1598	<fileset dir="${obj.jogl}" includes="lib@{output.lib.name}.jnilib"/>	1594	<fileset dir="${obj.jogl}" includes="lib@{output.lib.name}.dylib"/>
1599	</targetfiles>	1595	</targetfiles>
1600	<sequential>	1596	<sequential>
1601	<cc outtype="shared"	1597	<cc outtype="shared"
Lines 1644-1656 Link Here
1644		1640
1645	<!-- FIXME: this is a hack; the cpptask should have an option to change the	1641	<!-- FIXME: this is a hack; the cpptask should have an option to change the
1646	suffix or at least understand the override from dylib to jnilib -->	1642	suffix or at least understand the override from dylib to jnilib -->
1647	<antcall target="rename.dylib" inheritRefs="true">
1648	<param name="src" value="${obj.jogl}/lib@{output.lib.name}.dylib" />
1649	<param name="dest" value="${obj.jogl}/lib@{output.lib.name}.jnilib" />
1650	</antcall>
1651
1652	<!-- FIXME: this is a hack; the cpptask should have an option to change the
1653	suffix or at least understand the override from dylib to jnilib -->
1654	<antcall target="rename.mingw.dll" inheritRefs="true">	1643	<antcall target="rename.mingw.dll" inheritRefs="true">
1655	<param name="src" value="${obj.jogl}/lib@{output.lib.name}.so" />	1644	<param name="src" value="${obj.jogl}/lib@{output.lib.name}.so" />
1656	<param name="dest" value="${obj.jogl}/@{output.lib.name}.dll" />	1645	<param name="dest" value="${obj.jogl}/@{output.lib.name}.dll" />

Lines 616-625 Link Here

(-)a/make/build-nativewindow.xml (-12 / +1 lines)
616	<move file="${src}" tofile="${dest}" />	616	<move file="${src}" tofile="${dest}" />
617	</target>	617	</target>
618		618
619	<target name="rename.dylib" if="isOSX">
620	<move file="${src}" tofile="${dest}" />
621	</target>
622
623	<macrodef name="c.build">	619	<macrodef name="c.build">
624	<attribute name="c.compiler.src.files" />	620	<attribute name="c.compiler.src.files" />
625	<attribute name="compiler.cfg.id" />	621	<attribute name="compiler.cfg.id" />
Lines 688-694 Link Here
688	<targetfiles>	684	<targetfiles>
689	<fileset dir="${obj.nativewindow}" includes="lib@{output.lib.name}.so"/>	685	<fileset dir="${obj.nativewindow}" includes="lib@{output.lib.name}.so"/>
690	<fileset dir="${obj.nativewindow}" includes="@{output.lib.name}.dll"/>	686	<fileset dir="${obj.nativewindow}" includes="@{output.lib.name}.dll"/>
691	<fileset dir="${obj.nativewindow}" includes="lib@{output.lib.name}.jnilib"/>	687	<fileset dir="${obj.nativewindow}" includes="lib@{output.lib.name}.dylib"/>
692	</targetfiles>	688	</targetfiles>
693	<sequential>	689	<sequential>
694	<cc outtype="shared"	690	<cc outtype="shared"
Lines 729-741 Link Here
729		725
730	<!-- FIXME: this is a hack; the cpptask should have an option to change the	726	<!-- FIXME: this is a hack; the cpptask should have an option to change the
731	suffix or at least understand the override from dylib to jnilib -->	727	suffix or at least understand the override from dylib to jnilib -->
732	<antcall target="rename.dylib" inheritRefs="true">
733	<param name="src" value="${obj.nativewindow}/lib@{output.lib.name}.dylib" />
734	<param name="dest" value="${obj.nativewindow}/lib@{output.lib.name}.jnilib" />
735	</antcall>
736
737	<!-- FIXME: this is a hack; the cpptask should have an option to change the
738	suffix or at least understand the override from dylib to jnilib -->
739	<antcall target="rename.mingw.dll" inheritRefs="true">	728	<antcall target="rename.mingw.dll" inheritRefs="true">
740	<param name="src" value="${obj.nativewindow}/lib@{output.lib.name}.so" />	729	<param name="src" value="${obj.nativewindow}/lib@{output.lib.name}.so" />
741	<param name="dest" value="${obj.nativewindow}/@{output.lib.name}.dll" />	730	<param name="dest" value="${obj.nativewindow}/@{output.lib.name}.dll" />

Lines 620-629 Link Here

(-)a/make/build-newt.xml (-12 / +1 lines)
620	<move file="${src}" tofile="${dest}" />	620	<move file="${src}" tofile="${dest}" />
621	</target>	621	</target>
622		622
623	<target name="rename.dylib" if="isOSX">
624	<move file="${src}" tofile="${dest}" />
625	</target>
626
627	<macrodef name="c.build">	623	<macrodef name="c.build">
628	<attribute name="c.compiler.src.files" />	624	<attribute name="c.compiler.src.files" />
629	<attribute name="compiler.cfg.id" />	625	<attribute name="compiler.cfg.id" />
Lines 672-678 Link Here
672	<targetfiles>	668	<targetfiles>
673	<fileset dir="${obj.newt}" includes="lib@{output.lib.name}.so"/>	669	<fileset dir="${obj.newt}" includes="lib@{output.lib.name}.so"/>
674	<fileset dir="${obj.newt}" includes="@{output.lib.name}.dll"/>	670	<fileset dir="${obj.newt}" includes="@{output.lib.name}.dll"/>
675	<fileset dir="${obj.newt}" includes="lib@{output.lib.name}.jnilib"/>	671	<fileset dir="${obj.newt}" includes="lib@{output.lib.name}.dylib"/>
676	</targetfiles>	672	</targetfiles>
677	<sequential>	673	<sequential>
678	<cc outtype="shared"	674	<cc outtype="shared"
Lines 718-730 Link Here
718		714
719	<!-- FIXME: this is a hack; the cpptask should have an option to change the	715	<!-- FIXME: this is a hack; the cpptask should have an option to change the
720	suffix or at least understand the override from dylib to jnilib -->	716	suffix or at least understand the override from dylib to jnilib -->
721	<antcall target="rename.dylib" inheritRefs="true">
722	<param name="src" value="${obj.newt}/lib@{output.lib.name}.dylib" />
723	<param name="dest" value="${obj.newt}/lib@{output.lib.name}.jnilib" />
724	</antcall>
725
726	<!-- FIXME: this is a hack; the cpptask should have an option to change the
727	suffix or at least understand the override from dylib to jnilib -->
728	<antcall target="rename.mingw.dll" inheritRefs="true">	717	<antcall target="rename.mingw.dll" inheritRefs="true">
729	<param name="src" value="${obj.newt}/lib@{output.lib.name}.so" />	718	<param name="src" value="${obj.newt}/lib@{output.lib.name}.so" />
730	<param name="dest" value="${obj.newt}/@{output.lib.name}.dll" />	719	<param name="dest" value="${obj.newt}/@{output.lib.name}.dll" />

Lines 411-420 Link Here

(-)a/make/build-oculusvr.xml (-12 / +1 lines)
411	<move file="${src}" tofile="${dest}" />	411	<move file="${src}" tofile="${dest}" />
412	</target>	412	</target>
413		413
414	<target name="rename.dylib" if="isOSX">
415	<move file="${src}" tofile="${dest}" />
416	</target>
417
418	<macrodef name="c.build">	414	<macrodef name="c.build">
419	<attribute name="compiler.cfg.id" />	415	<attribute name="compiler.cfg.id" />
420	<attribute name="linker.cfg.id" />	416	<attribute name="linker.cfg.id" />
Lines 530-536 Link Here
530	<targetfiles>	526	<targetfiles>
531	<fileset dir="${obj.oculusvr}" includes="lib@{output.lib.name}.so"/>	527	<fileset dir="${obj.oculusvr}" includes="lib@{output.lib.name}.so"/>
532	<fileset dir="${obj.oculusvr}" includes="@{output.lib.name}.dll"/>	528	<fileset dir="${obj.oculusvr}" includes="@{output.lib.name}.dll"/>
533	<fileset dir="${obj.oculusvr}" includes="lib@{output.lib.name}.jnilib"/>	529	<fileset dir="${obj.oculusvr}" includes="lib@{output.lib.name}.dylib"/>
534	</targetfiles>	530	</targetfiles>
535	<sequential>	531	<sequential>
536	<!-- C Compilation -->	532	<!-- C Compilation -->
Lines 661-673 Link Here
661		657
662	<!-- FIXME: this is a hack; the cpptask should have an option to change the	658	<!-- FIXME: this is a hack; the cpptask should have an option to change the
663	suffix or at least understand the override from dylib to jnilib -->	659	suffix or at least understand the override from dylib to jnilib -->
664	<antcall target="rename.dylib" inheritRefs="true">
665	<param name="src" value="${obj.oculusvr}/lib@{output.lib.name}.dylib" />
666	<param name="dest" value="${obj.oculusvr}/lib@{output.lib.name}.jnilib" />
667	</antcall>
668
669	<!-- FIXME: this is a hack; the cpptask should have an option to change the
670	suffix or at least understand the override from dylib to jnilib -->
671	<antcall target="rename.mingw.dll" inheritRefs="true">	660	<antcall target="rename.mingw.dll" inheritRefs="true">
672	<param name="src" value="${obj.oculusvr}/lib@{output.lib.name}.so" />	661	<param name="src" value="${obj.oculusvr}/lib@{output.lib.name}.so" />
673	<param name="dest" value="${obj.oculusvr}/@{output.lib.name}.dll" />	662	<param name="dest" value="${obj.oculusvr}/@{output.lib.name}.dll" />