Added CgGL.cgCreateProgramFromStream and updated JOGL Cg demos to use

it so they can be run with Java Web Start.


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

1 files changed, 1 insertions, 18 deletions

diff --git a/make/cg-common.cfg b/make/cg-common.cfg
index 275d9941d..2954538f6 100644
--- a/make/cg-common.cfg
+++ b/make/cg-common.cfg
@@ -74,21 +74,4 @@ RuntimeExceptionType CgException
 CustomCCode #include <stdlib.h>
 CustomCCode #include <Cg/cgGL.h>
 
-CustomJavaCode CgGL static {
-CustomJavaCode CgGL   AccessController.doPrivileged(new PrivilegedAction() {
-CustomJavaCode CgGL     public Object run() {
-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;
-CustomJavaCode CgGL     }
-CustomJavaCode CgGL   });
-CustomJavaCode CgGL }
+IncludeAs CustomJavaCode CgGL cg-common-CustomJavaCode.java