diff options
| author | Kenneth Russel <[email protected]> | 2005-02-07 16:28:05 +0000 |
|---|---|---|
| committer | Kenneth Russel <[email protected]> | 2005-02-07 16:28:05 +0000 |
| commit | 3eced7c6493c462221cddaa1a5e3700a2ca51bb3 (patch) | |
| tree | 4f9cb7b5460f0b4964de6efc6c722136fef0e9a1 | |
| parent | f303d66c1a5c33fa4e392117919af87665dedc2b (diff) | |
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
| -rw-r--r-- | make/cg-common.cfg | 14 | ||||
| -rw-r--r-- | make/glu-impl-x11.cfg | 4 |
2 files changed, 10 insertions, 8 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; diff --git a/make/glu-impl-x11.cfg b/make/glu-impl-x11.cfg index 3e46a73b5..35fc7034d 100644 --- a/make/glu-impl-x11.cfg +++ b/make/glu-impl-x11.cfg @@ -1,8 +1,6 @@ # This .cfg file is used to generate the GLU implementation on # X11. -Include glu-impl-common.cfg - CustomCCode #include <inttypes.h> - +Include glu-impl-common.cfg |