From 37760af388303834e359703aad9562ce6165845f Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Fri, 11 Jul 2014 03:09:58 +0200
Subject: Bug 1024: Add fallback for native-jar-file location via classpath
Adapt to GlueGen commit f5c48efcf546ba4e08e197ccced6df83b57e1755
---
src/jogl/classes/javax/media/opengl/GLProfile.java | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
(limited to 'src/jogl/classes/javax/media/opengl/GLProfile.java')
diff --git a/src/jogl/classes/javax/media/opengl/GLProfile.java b/src/jogl/classes/javax/media/opengl/GLProfile.java
index 063ad3ef7..324fdee92 100644
--- a/src/jogl/classes/javax/media/opengl/GLProfile.java
+++ b/src/jogl/classes/javax/media/opengl/GLProfile.java
@@ -37,7 +37,6 @@
package javax.media.opengl;
-import jogamp.nativewindow.NWJNILibLoader;
import jogamp.opengl.Debug;
import jogamp.opengl.GLDrawableFactoryImpl;
import jogamp.opengl.DesktopGLDynamicLookupHelper;
@@ -132,10 +131,10 @@ public class GLProfile {
if(TempJarCache.isInitialized()) {
final ClassLoader cl = GLProfile.class.getClassLoader();
- final String newtFactoryClassName = "com.jogamp.newt.NewtFactory";
- final Class<?>[] classesFromJavaJars = new Class<?>[] { NWJNILibLoader.class, GLProfile.class, null };
- if( ReflectionUtil.isClassAvailable(newtFactoryClassName, cl) ) {
- classesFromJavaJars[2] = ReflectionUtil.getClass(newtFactoryClassName, false, cl);
+ final String newtDebugClassName = "jogamp.newt.Debug";
+ final Class<?>[] classesFromJavaJars = new Class<?>[] { jogamp.nativewindow.Debug.class, jogamp.opengl.Debug.class, null };
+ if( ReflectionUtil.isClassAvailable(newtDebugClassName, cl) ) {
+ classesFromJavaJars[2] = ReflectionUtil.getClass(newtDebugClassName, false, cl);
}
JNILibLoaderBase.addNativeJarLibsJoglCfg(classesFromJavaJars);
}
--
cgit v1.2.3