From 3eced7c6493c462221cddaa1a5e3700a2ca51bb3 Mon Sep 17 00:00:00 2001 From: Kenneth Russel Date: Mon, 7 Feb 2005 16:28:05 +0000 Subject: 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 --- make/cg-common.cfg | 14 +++++++++----- make/glu-impl-x11.cfg | 4 +--- 2 files changed, 10 insertions(+), 8 deletions(-) (limited to 'make') 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 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 - +Include glu-impl-common.cfg -- cgit v1.2.3