diff options
| author | Sven Gothel <[email protected]> | 2013-09-02 21:01:10 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2013-09-02 21:01:10 +0200 |
| commit | 14eab8af439e6e7ce7ee08a9ca13fec3f3a80d25 (patch) | |
| tree | 0471a459935d36848f6beaec22c4bec5b0ee234b /src/jogl/classes | |
| parent | 275540ba96155277d45b4312888e60b65c372454 (diff) | |
Fix Bug 810: Adding Julien Gouesse's fix while moved the new 'addNativeJarLibsJoglCfg(..)' to GlueGen, commit c0ead6fa10280f8076704726d59f482b183fd77e
Diffstat (limited to 'src/jogl/classes')
| -rw-r--r-- | src/jogl/classes/javax/media/opengl/GLProfile.java | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/jogl/classes/javax/media/opengl/GLProfile.java b/src/jogl/classes/javax/media/opengl/GLProfile.java index 51b822449..e3078271e 100644 --- a/src/jogl/classes/javax/media/opengl/GLProfile.java +++ b/src/jogl/classes/javax/media/opengl/GLProfile.java @@ -143,16 +143,12 @@ public class GLProfile { if(TempJarCache.isInitialized()) { final ClassLoader cl = GLProfile.class.getClassLoader(); - // either: [jogl-all.jar, jogl-all-noawt.jar, jogl-all-mobile.jar] -> jogl-all-natives-<os.and.arch>.jar - // or: nativewindow-core.jar -> nativewindow-natives-<os.and.arch>.jar, - // jogl-core.jar -> jogl-natives-<os.and.arch>.jar, - // (newt-core.jar -> newt-natives-<os.and.arch>.jar)? (if available) 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); } - JNILibLoaderBase.addNativeJarLibs(classesFromJavaJars, "-all", new String[] { "-noawt", "-mobile", "-core" } ); + JNILibLoaderBase.addNativeJarLibsJoglCfg(classesFromJavaJars); } initProfilesForDefaultDevices(); return null; @@ -170,7 +166,7 @@ public class GLProfile { } } } - + /** * Trigger eager initialization of GLProfiles for the given device, * in case it isn't done yet. |