From 958b64beb44a470301a4354ae7d5133236e2f40f Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Tue, 18 Oct 2011 12:57:08 +0200
Subject: Fix Solaris gcc args ; Cleanup dependencies and linker args; Adding
 JVM arch flags (-d32/-d64) ; glxext.h uses 'gl-64bit-types.h'

Cleanup dependencies and linker args
  - JOGL/NEWT: remove Xxf86vm dependency
  - NativeWindow Solaris: Use std 'Xinerama' and 'xf86vmode'
---
 make/build-newt.xml | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'make/build-newt.xml')

diff --git a/make/build-newt.xml b/make/build-newt.xml
index e433b289c..d3248fa9d 100644
--- a/make/build-newt.xml
+++ b/make/build-newt.xml
@@ -239,15 +239,15 @@
       <!-- linker configuration -->
 
       <linker id="linker.cfg.freebsd.newt.x11" extends="linker.cfg.freebsd">
-        <syslibset dir="/usr/local/lib" libs="X11"/>
+        <linkerarg value="-L/usr/local/lib"/>
+        <syslibset libs="X11"/>
         <syslibset libs="Xrandr"/>
-        <syslibset dir="/usr/local/lib" libs="Xxf86vm" />
       </linker>
 
       <linker id="linker.cfg.freebsd.amd64.newt.x11" extends="linker.cfg.freebsd.amd64">
-        <syslibset dir="/usr/local/lib" libs="X11"/>
+        <linkerarg value="-L/usr/local/lib"/>
+        <syslibset libs="X11"/>
         <syslibset libs="Xrandr"/>
-        <syslibset dir="/usr/local/lib" libs="Xxf86vm" />
       </linker>
 
       <linker id="linker.cfg.linux.newt.broadcom_egl" extends="linker.cfg.linux">
@@ -258,25 +258,21 @@
       <linker id="linker.cfg.linux.newt.x11" extends="linker.cfg.linux">
         <syslibset libs="X11"/>
         <syslibset libs="Xrandr"/>
-        <syslibset libs="Xxf86vm" />
       </linker>
 
       <linker id="linker.cfg.linux.x86.newt.x11" extends="linker.cfg.linux.x86">
         <syslibset libs="X11"/>
         <syslibset libs="Xrandr"/>
-        <syslibset libs="Xxf86vm" />
       </linker>
 
       <linker id="linker.cfg.linux.amd64.newt.x11" extends="linker.cfg.linux.amd64">
         <syslibset libs="X11"/>
         <syslibset libs="Xrandr"/>
-        <syslibset libs="Xxf86vm" />
       </linker>
 
       <linker id="linker.cfg.linux.armv7.newt.x11" extends="linker.cfg.linux.armv7">
         <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="X11" />
         <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="Xrandr" />
-        <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="Xxf86vm" />
       </linker>
 
       <linker id="linker.cfg.android.newt" extends="linker.cfg.android">
@@ -285,14 +281,19 @@
 
       <linker id="linker.cfg.solaris.newt.x11" extends="linker.cfg.solaris">
         <syslibset libs="X11"/>
+        <syslibset libs="Xrandr"/>
       </linker>
 
       <linker id="linker.cfg.solaris.sparcv9.newt.x11" extends="linker.cfg.solaris.sparcv9">
-        <syslibset dir="/usr/lib/sparcv9" libs="X11"/>
+        <linkerarg value="-L/usr/lib/sparcv9"/>
+        <syslibset libs="X11"/>
+        <syslibset libs="Xrandr"/>
       </linker>
 
       <linker id="linker.cfg.solaris.amd64.newt.x11" extends="linker.cfg.solaris.amd64">
-        <syslibset dir="/usr/lib/amd64" libs="X11"/>
+        <linkerarg value="-L/usr/lib/amd64"/>
+        <syslibset libs="X11"/>
+        <syslibset libs="Xrandr"/>
       </linker>
 
       <linker id="linker.cfg.win32.mingw.newt" extends="linker.cfg.win32.mingw">
-- 
cgit v1.2.3