From 4a43734dc09b56e418ca5036f54c856555ac2920 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Tue, 22 Feb 2011 08:51:09 +0100
Subject: NativeWindow/SWT: Rename SWTMisc -> SWTAccessor; Add to
 nativewindow.core.jar

---
 etc/profile.jogl | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

(limited to 'etc')

diff --git a/etc/profile.jogl b/etc/profile.jogl
index ecf4fe35d..dec12969c 100755
--- a/etc/profile.jogl
+++ b/etc/profile.jogl
@@ -148,22 +148,24 @@ if [ "$KERNEL" = "linux" ] ; then
 elif [ "$KERNEL" = "darwin" ] ; then
     SWT_SUB="cocoa"
 fi
-SWT_CLASSPATH_0=$JOGL_BUILD_DIR/../make/lib/swt/$SWT_SUB-$KERNEL-$ARCH/swt-debug.jar
-SWT_CLASSPATH_1=$HOME/.java/swt.jar
-if [ ! -e "$SWT_CLASSPATH_0" ] ; then 
-    echo Info: NO JOGL SWT $SWT_CLASSPATH_0
-    if [ ! -e "$SWT_CLASSPATH_1" ] ; then 
-        echo Info: NO Users SWT $SWT_CLASSPATH_1
+if [ -z "$SWT_CLASSPATH" ] ; then
+    SWT_CLASSPATH_0=$JOGL_BUILD_DIR/../make/lib/swt/$SWT_SUB-$KERNEL-$ARCH/swt-debug.jar
+    SWT_CLASSPATH_1=$HOME/.java/swt.jar
+    if [ ! -e "$SWT_CLASSPATH_0" ] ; then 
+        echo Info: NO JOGL SWT $SWT_CLASSPATH_0
+        if [ ! -e "$SWT_CLASSPATH_1" ] ; then 
+            echo Info: NO Users SWT $SWT_CLASSPATH_1
+        else
+            export SWT_CLASSPATH=$SWT_CLASSPATH_1
+            echo Info: Using Users SWT $SWT_CLASSPATH
+        fi
     else
-        export SWT_CLASSPATH=$SWT_CLASSPATH_1
-        echo Info: Using Users SWT $SWT_CLASSPATH
+        export SWT_CLASSPATH=$SWT_CLASSPATH_0
+        echo Info: Using JOGL SWT $SWT_CLASSPATH
+    fi
+    if [ ! -z "$SWT_CLASSPATH" ] ; then
+        export SWT_CLASSPATH
     fi
-else
-    export SWT_CLASSPATH=$SWT_CLASSPATH_0
-    echo Info: Using JOGL SWT $SWT_CLASSPATH
-fi
-if [ ! -z "$SWT_CLASSPATH" ] ; then
-    export SWT_CLASSPATH
 fi
 
 if [ -z "$JOGL_CLASSPATH" ] ; then
-- 
cgit v1.2.3