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'

4 files changed, 124 insertions, 0 deletions

diff --git a/make/scripts/make.jogl.all.solaris-x86.sh b/make/scripts/make.jogl.all.solaris-x86.sh
new file mode 100755
index 000000000..a5b99e47b
--- /dev/null
+++ b/make/scripts/make.jogl.all.solaris-x86.sh
@@ -0,0 +1,52 @@
+#! /bin/sh
+
+SDIR=`dirname $0` 
+
+if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86.sh ] ; then
+    . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86.sh
+fi
+
+if [ "$1" = "-libdir" ] ; then
+    shift
+    if [ -z "$1" ] ; then
+        echo libdir argument missing
+        print_usage
+        exit
+    fi
+    CUSTOMLIBDIR="-Dcustom.libdir=$1"
+    shift
+fi
+
+#    -Dc.compiler.debug=true \
+
+#    -Dgluegen.cpptasks.detected.os=true \
+#    -DisUnix=true \
+#    -DisLinux=true \
+#    -DisLinuxAMD64=true \
+#    -DisX11=true \
+
+#LD_LIBRARY_PATH=/opt-linux-x86/mesa-7.8.1/lib
+#export LD_LIBRARY_PATH
+
+LOGF=make.jogl.all.solaris-x86.log
+rm -f $LOGF
+
+# export LIBGL_DRIVERS_PATH=/usr/lib/fglrx/dri:/usr/lib32/fglrx/dri
+# export LIBGL_DEBUG=verbose
+echo LIBXCB_ALLOW_SLOPPY_LOCK: $LIBXCB_ALLOW_SLOPPY_LOCK 2>&1 | tee -a $LOGF
+echo LIBGL_DRIVERS_PATH: $LIBGL_DRIVERS_PATH 2>&1 | tee -a $LOGF
+echo LIBGL_DEBUG: $LIBGL_DEBUG 2>&1 | tee -a $LOGF
+
+#    -Dc.compiler.debug=true \
+#    -Djavacdebug="true" \
+#    -Djavacdebuglevel="source,lines,vars" \
+
+# BUILD_ARCHIVE=true \
+ant  \
+    $CUSTOMLIBDIR \
+    -Djavacdebuglevel="source,lines,vars" \
+    -Drootrel.build=build-solaris-x86 \
+    -Dsetup.addNativeOpenMAX=true \
+    -Dsetup.addNativeKD=true \
+    $* 2>&1 | tee -a $LOGF
+
diff --git a/make/scripts/make.jogl.all.solaris-x86_64.sh b/make/scripts/make.jogl.all.solaris-x86_64.sh
new file mode 100755
index 000000000..ff6031957
--- /dev/null
+++ b/make/scripts/make.jogl.all.solaris-x86_64.sh
@@ -0,0 +1,52 @@
+#! /bin/sh
+
+SDIR=`dirname $0` 
+
+if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then
+    . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh
+fi
+
+if [ "$1" = "-libdir" ] ; then
+    shift
+    if [ -z "$1" ] ; then
+        echo libdir argument missing
+        print_usage
+        exit
+    fi
+    CUSTOMLIBDIR="-Dcustom.libdir=$1"
+    shift
+fi
+
+#    -Dc.compiler.debug=true \
+
+#    -Dgluegen.cpptasks.detected.os=true \
+#    -DisUnix=true \
+#    -DisLinux=true \
+#    -DisLinuxAMD64=true \
+#    -DisX11=true \
+
+#LD_LIBRARY_PATH=/opt-linux-x86_64/mesa-7.8.1/lib64
+#export LD_LIBRARY_PATH
+
+LOGF=make.jogl.all.solaris-x86_64.log
+rm -f $LOGF
+
+# export LIBGL_DRIVERS_PATH=/usr/lib/fglrx/dri:/usr/lib32/fglrx/dri
+# export LIBGL_DEBUG=verbose
+echo LIBXCB_ALLOW_SLOPPY_LOCK: $LIBXCB_ALLOW_SLOPPY_LOCK 2>&1 | tee -a $LOGF
+echo LIBGL_DRIVERS_PATH: $LIBGL_DRIVERS_PATH 2>&1 | tee -a $LOGF
+echo LIBGL_DEBUG: $LIBGL_DEBUG 2>&1 | tee -a $LOGF
+
+#    -Dc.compiler.debug=true \
+#    -Djavacdebug="true" \
+#    -Djavacdebuglevel="source,lines,vars" \
+
+# BUILD_ARCHIVE=true \
+ant  \
+    $CUSTOMLIBDIR \
+    -Djavacdebuglevel="source,lines,vars" \
+    -Drootrel.build=build-solaris-x86_64 \
+    -Dsetup.addNativeOpenMAX=true \
+    -Dsetup.addNativeKD=true \
+    $* 2>&1 | tee -a $LOGF
+
diff --git a/make/scripts/tests-solx32.sh b/make/scripts/tests-solx32.sh
new file mode 100755
index 000000000..26b7c14bb
--- /dev/null
+++ b/make/scripts/tests-solx32.sh
@@ -0,0 +1,10 @@
+#! /bin/bash
+
+SDIR=`dirname $0` 
+
+if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86.sh ] ; then
+    . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86.sh
+fi
+
+. $SDIR/tests.sh  `which java` ../build-solaris-x86 $*
+
diff --git a/make/scripts/tests-solx64.sh b/make/scripts/tests-solx64.sh
new file mode 100755
index 000000000..b5667e508
--- /dev/null
+++ b/make/scripts/tests-solx64.sh
@@ -0,0 +1,10 @@
+#! /bin/bash
+
+SDIR=`dirname $0` 
+
+if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then
+    . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh
+fi
+
+. $SDIR/tests.sh  `which java` ../build-solaris-x86_64 $*
+