Fixed problem in glu-impl-x11.cfg after switch over to use GKW's pure

Java port of GLU mipmap and image scaling routines. Fixed problem in
attempted workaround to allow Cg libraries to be found on
java.library.path.


git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@216 232f8b59-042b-4e1e-8c03-345bb8c30851

1 files changed, 9 insertions, 5 deletions

diff --git a/make/cg-common.cfg b/make/cg-common.cfg
index 315dda214..906fbbf09 100644
--- a/make/cg-common.cfg
+++ b/make/cg-common.cfg
@@ -72,11 +72,15 @@ CustomCCode #include <Cg/cgGL.h>
 CustomJavaCode CgGL static {
 CustomJavaCode CgGL   AccessController.doPrivileged(new PrivilegedAction() {
 CustomJavaCode CgGL     public Object run() {
-CustomJavaCode CgGL       // Workaround so that these don't need to be in the system
-CustomJavaCode CgGL       // path but can be referenced from java.library.path
-CustomJavaCode CgGL       // (this is intended to help with Webstarted applications)
-CustomJavaCode CgGL       System.loadLibrary("cg");
-CustomJavaCode CgGL       System.loadLibrary("cgGL");
+CustomJavaCode CgGL       try {
+CustomJavaCode CgGL         // Workaround so that these don't need to be in the system
+CustomJavaCode CgGL         // path but can be referenced from java.library.path
+CustomJavaCode CgGL         // (this is intended to help with Webstarted applications)
+CustomJavaCode CgGL         System.loadLibrary("cg");
+CustomJavaCode CgGL         System.loadLibrary("cgGL");
+CustomJavaCode CgGL       } catch (UnsatisfiedLinkError e) {
+CustomJavaCode CgGL         // Consider this non-fatal
+CustomJavaCode CgGL       }
 CustomJavaCode CgGL       // Load the actual Cg binding
 CustomJavaCode CgGL       System.loadLibrary("jogl_cg");
 CustomJavaCode CgGL       return null;