From 4e91f5e085585481b542c476a1ba599f2e914bf1 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Tue, 17 Jun 2014 23:42:58 +0200 Subject: 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. --- make/config/jogl/glu-CustomJavaCode-gl2.java | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'make/config/jogl/glu-CustomJavaCode-gl2.java') diff --git a/make/config/jogl/glu-CustomJavaCode-gl2.java b/make/config/jogl/glu-CustomJavaCode-gl2.java index 4dcb5691e..c8ac9403b 100644 --- a/make/config/jogl/glu-CustomJavaCode-gl2.java +++ b/make/config/jogl/glu-CustomJavaCode-gl2.java @@ -7,6 +7,10 @@ static { if (val != null && !val.toLowerCase().equals("false")) { useJavaMipmapCode = false; } + // Native code exists + if( !initializeImpl() ) { + throw new RuntimeException("Initialization failure"); + } return null; } }); -- cgit v1.2.3