Merge remote-tracking branch 'github-sgothel/master' into armv6hf

3 files changed, 7 insertions, 2 deletions

diff --git a/etc/profile.jogl b/etc/profile.jogl
index 4402adde6..7dd51919d 100755
--- a/etc/profile.jogl
+++ b/etc/profile.jogl
@@ -25,6 +25,9 @@ function concat_jogl_list()
 
 ARCH=`uname -m`
 KERNEL=`uname -s | awk ' { printf "%s",tolower($0) ; } '`
+if [ "$KERNEL" = "sunos" ] ; then
+    KERNEL="solaris"
+fi
 
 uname -a | grep -i LINUX && OSS=x11
 uname -a | grep -i Darwin && OSS=osx
@@ -99,6 +102,8 @@ export JOGL_CLASSPATH
 
 if [ "$KERNEL" = "linux" ] ; then
     SWT_SUB="gtk"
+elif [ "$KERNEL" = "solaris" ] ; then
+    SWT_SUB="gtk"
 elif [ "$KERNEL" = "darwin" ] ; then
     SWT_SUB="cocoa"
     KERNEL="macosx"
diff --git a/etc/test.bat b/etc/test.bat
index 0c82233ca..d635c7e8f 100755
--- a/etc/test.bat
+++ b/etc/test.bat
@@ -1,7 +1,7 @@
 

 set BLD_DIR=jar

 

-set CP_ALL=.;%BLD_DIR%\gluegen-rt.jar;%BLD_DIR%\jogl.all.jar

+set CP_ALL=.;%BLD_DIR%\gluegen-rt.jar;%BLD_DIR%\jogl-all.jar

 echo CP_ALL %CP_ALL%

 

 set X_ARGS="-Dsun.java2d.noddraw=true" "-Dsun.awt.noerasebackground=true"

diff --git a/etc/test_dbg.bat b/etc/test_dbg.bat
index 33bbb912b..209690758 100755
--- a/etc/test_dbg.bat
+++ b/etc/test_dbg.bat
@@ -1,7 +1,7 @@
 

 set BLD_DIR=jar

 

-set CP_ALL=.;%BLD_DIR%\gluegen-rt.jar;%BLD_DIR%\jogl.all.jar

+set CP_ALL=.;%BLD_DIR%\gluegen-rt.jar;%BLD_DIR%\jogl-all.jar

 echo CP_ALL %CP_ALL%

 

 set D_ARGS="-Djogamp.debug=all" "-Dnativewindow.debug=all" "-Djogl.debug=all" "-Dnewt.debug=all"