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

(-)jogl/make/build-jogl.xml.orig (-2 / +2 lines)
Lines 1195-1201 Link Here
1195
1195
1196
      <!-- linker configuration -->
1196
      <!-- linker configuration -->
1197
 
1197
 
1198
      <linker id="linker.cfg.freebsd.jogl.x11" extends="linker.cfg.freebsd">
1198
      <linker id="linker.cfg.freebsd.x86.jogl.x11" extends="linker.cfg.freebsd.x86">
1199
        <syslibset dir="/usr/local/lib" libs="X11"/>
1199
        <syslibset dir="/usr/local/lib" libs="X11"/>
1200
      </linker>
1200
      </linker>
1201
1201
Lines 1383-1389 Link Here
1383
    <target name="c.configure.freebsd.x86" depends="c.configure.x11" if="isFreeBSDX86">
1383
    <target name="c.configure.freebsd.x86" depends="c.configure.x11" if="isFreeBSDX86">
1384
      <echo message="FreeBSD" />
1384
      <echo message="FreeBSD" />
1385
      <property name="compiler.cfg.id"                     value="compiler.cfg.freebsd.jogl" />
1385
      <property name="compiler.cfg.id"                     value="compiler.cfg.freebsd.jogl" />
1386
      <property name="linker.cfg.id.os"                    value="linker.cfg.freebsd.jogl.x11" />
1386
      <property name="linker.cfg.id.os"                    value="linker.cfg.freebsd.x86.jogl.x11" />
1387
    </target>
1387
    </target>
1388
1388
1389
    <target name="c.configure.freebsd.amd64" depends="c.configure.x11" if="isFreeBSDAMD64">
1389
    <target name="c.configure.freebsd.amd64" depends="c.configure.x11" if="isFreeBSDAMD64">
(-)jogl/make/build-nativewindow.xml.orig (-2 / +2 lines)
Lines 365-371 Link Here
365
365
366
      <!-- linker configuration -->
366
      <!-- linker configuration -->
367
367
368
      <linker id="linker.cfg.freebsd.nativewindow.x11" extends="linker.cfg.freebsd">
368
      <linker id="linker.cfg.freebsd.x86.nativewindow.x11" extends="linker.cfg.freebsd.x86">
369
        <syslibset dir="/usr/local/lib" libs="X11"/>
369
        <syslibset dir="/usr/local/lib" libs="X11"/>
370
        <syslibset dir="/usr/local/lib" libs="Xxf86vm" />
370
        <syslibset dir="/usr/local/lib" libs="Xxf86vm" />
371
        <syslibset dir="/usr/local/lib" libs="Xrender"/>
371
        <syslibset dir="/usr/local/lib" libs="Xrender"/>
Lines 562-568 Link Here
562
    <target name="c.configure.freebsd.x86" if="isFreeBSDX86">
562
    <target name="c.configure.freebsd.x86" if="isFreeBSDX86">
563
      <echo message="FreeBSD.x86" />
563
      <echo message="FreeBSD.x86" />
564
      <property name="compiler.cfg.id"                      value="compiler.cfg.freebsd.nativewindow" />
564
      <property name="compiler.cfg.id"                      value="compiler.cfg.freebsd.nativewindow" />
565
      <property name="linker.cfg.id.oswin"                  value="linker.cfg.freebsd.nativewindow.x11" />
565
      <property name="linker.cfg.id.oswin"                  value="linker.cfg.freebsd.x86.nativewindow.x11" />
566
    </target>
566
    </target>
567
    
567
    
568
    <target name="c.configure.freebsd.amd64" if="isFreeBSDAMD64">
568
    <target name="c.configure.freebsd.amd64" if="isFreeBSDAMD64">
(-)jogl/make/build-newt.xml.orig (-3 / +3 lines)
Lines 273-279 Link Here
273
273
274
      <!-- linker configuration -->
274
      <!-- linker configuration -->
275
275
276
      <linker id="linker.cfg.freebsd.newt.x11" extends="linker.cfg.freebsd">
276
      <linker id="linker.cfg.freebsd.x86.newt.x11" extends="linker.cfg.freebsd.x86">
277
        <linkerarg value="-L/usr/local/lib"/>
277
        <linkerarg value="-L/usr/local/lib"/>
278
        <syslibset libs="X11"/>
278
        <syslibset libs="X11"/>
279
        <syslibset libs="Xrandr"/>
279
        <syslibset libs="Xrandr"/>
Lines 528-535 Link Here
528
    <target name="c.configure.freebsd.x86" if="isFreeBSDX86">
528
    <target name="c.configure.freebsd.x86" if="isFreeBSDX86">
529
      <echo message="FreeBSD.x86" />
529
      <echo message="FreeBSD.x86" />
530
      <property name="compiler.cfg.id"                      value="compiler.cfg.freebsd.newt" />
530
      <property name="compiler.cfg.id"                      value="compiler.cfg.freebsd.newt" />
531
      <condition property="linker.cfg.id.oswin"             value="linker.cfg.freebsd.newt.x11"
531
      <condition property="linker.cfg.id.oswin"             value="linker.cfg.freebsd.x86.newt.x11"
532
                                                            else="linker.cfg.freebsd">
532
                                                            else="linker.cfg.freebsd.x86">
533
          <isset property="isX11" />
533
          <isset property="isX11" />
534
      </condition>
534
      </condition>
535
      <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
535
      <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />

Return to bug 1007