Fixed Issue 215: Enhancement for NativeLibLoader

Incorporated patch largely unmodified from user s_koehler. Cleaned up
Cg library loading based on this work.


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

1 files changed, 1 insertions, 16 deletions

diff --git a/make/cg-common-CustomJavaCode.java b/make/cg-common-CustomJavaCode.java
index ba0df4ee9..63afdb65d 100755
--- a/make/cg-common-CustomJavaCode.java
+++ b/make/cg-common-CustomJavaCode.java
@@ -1,20 +1,5 @@
 static {
-  AccessController.doPrivileged(new PrivilegedAction() {
-    public Object run() {
-      try {
-        // Workaround so that these don't need to be in the system
-        // path but can be referenced from java.library.path
-        // (this is intended to help with Webstarted applications)
-        System.loadLibrary("cg");
-        System.loadLibrary("cgGL");
-      } catch (UnsatisfiedLinkError e) {
-        // Consider this non-fatal
-      }
-      // Load the actual Cg binding
-      System.loadLibrary("jogl_cg");
-      return null;
-    }
-  });
+  NativeLibLoader.loadCgImpl();
 }
 
 /** A convenience method which reads all available data from the InputStream and then calls cgCreateProgram. */