diff options
author | Sven Gothel <[email protected]> | 2014-06-17 23:42:58 +0200 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2014-06-17 23:42:58 +0200 |
commit | 4e91f5e085585481b542c476a1ba599f2e914bf1 (patch) | |
tree | 1b8164703ad61ab367d74a3880acf2c9a6b3dedf /make/config/jogl/glu-CustomJavaCode-base.java | |
parent | 68ca3ae8fcce28c62034299bc6e6f7eaab50bd1f (diff) |
Fix regression due to GlueGen commit c3054a01990e55ab35756ea23ab7d7c05f24dd37, completes JOGL commit 68ca3ae8fcce28c62034299bc6e6f7eaab50bd1f
Add handling of 'initializeImpl()' of generated GLU* classes:
- GLU : no 'initializeImpl()' <- no libs
- GLUgl2es1: no 'initializeImpl()' <- no libs
- GLUgl: call 'initializeImpl()' in manual static init impl.
Further more, we shall not initialize the GLU* classes in GLU
static init method, querying GLU* class availability.
Tested via OlympicES1.
Diffstat (limited to 'make/config/jogl/glu-CustomJavaCode-base.java')
-rw-r--r-- | make/config/jogl/glu-CustomJavaCode-base.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/make/config/jogl/glu-CustomJavaCode-base.java b/make/config/jogl/glu-CustomJavaCode-base.java index 21d6277e9..48fe31329 100644 --- a/make/config/jogl/glu-CustomJavaCode-base.java +++ b/make/config/jogl/glu-CustomJavaCode-base.java @@ -83,11 +83,16 @@ static { Class _gl2Class=null; Class _gl2es1Class=null; try { - _gl2Class = Class.forName("javax.media.opengl.glu.gl2.GLUgl2"); - _gl2es1Class = Class.forName("javax.media.opengl.glu.gl2es1.GLUgl2es1"); + final ClassLoader cl = GLU.class.getClassLoader(); + _gl2Class = Class.forName("javax.media.opengl.glu.gl2.GLUgl2", false, cl); + _gl2es1Class = Class.forName("javax.media.opengl.glu.gl2es1.GLUgl2es1", false, cl); } catch (Throwable t) {} gl2Class = _gl2Class; gl2es1Class = _gl2es1Class; + /** No native code, not required nor possible + if( !initializeImpl() ) { + throw new RuntimeException("Initialization failure"); + } */ } /** |