Adapt to GlueGen commit c3054a01990e55ab35756ea23ab7d7c05f24dd37 (compount call-by-value extension)

6 files changed, 13 insertions, 1 deletions

diff --git a/make/config/joal-common-CustomJavaCode.java b/make/config/joal-al-CustomJavaCode.java
index 5df6cfd..551e51a 100644
--- a/make/config/joal-common-CustomJavaCode.java
+++ b/make/config/joal-al-CustomJavaCode.java
@@ -20,6 +20,9 @@ static {
                                       throw new RuntimeException("Couln't load native AL/JNI glue library");
                                     }
                                     alProcAddressTable.reset(bundle);
+                                    if( !initializeImpl() ) {
+                                        throw new RuntimeException("Initialization failure");
+                                    }                                      
                                     return bundle;
                                 } } );
 }
diff --git a/make/config/joal-alc.cfg b/make/config/joal-alc.cfg
index efba5a6..be27733 100755
--- a/make/config/joal-alc.cfg
+++ b/make/config/joal-alc.cfg
@@ -42,6 +42,7 @@ ManuallyImplement alcGetString
 # going to wrap it in another method
 IncludeAs CustomJavaCode ALC     joal-alc-CustomJavaCode.java
 IncludeAs CustomJavaCode ALCAbstractImpl joal-alcabstract-CustomJavaCode.java
+ManualStaticInit ALCAbstractImpl
 
 # These routines use strings
 ArgumentIsString alcIsExtensionPresent 1
diff --git a/make/config/joal-alcabstract-CustomJavaCode.java b/make/config/joal-alcabstract-CustomJavaCode.java
index debadad..f0a7173 100755
--- a/make/config/joal-alcabstract-CustomJavaCode.java
+++ b/make/config/joal-alcabstract-CustomJavaCode.java
@@ -8,6 +8,9 @@ static {
                                       throw new RuntimeException("Couldn't instantiate ALCProcAddressTable");
                                     }
                                     alcProcAddressTable.reset(ALImpl.alDynamicLookupHelper);
+                                    if( !initializeImpl() ) {
+                                        throw new RuntimeException("Initialization failure");
+                                    }                                      
                                     return alcProcAddressTable;
                                 } } );
 }
diff --git a/make/config/joal-alext.cfg b/make/config/joal-alext.cfg
index da63612..a775c4b 100644
--- a/make/config/joal-alext.cfg
+++ b/make/config/joal-alext.cfg
@@ -39,6 +39,7 @@ Ignore ^AL_.+
 Ignore ^ALC_.+
 
 IncludeAs CustomJavaCode ALExtAbstractImpl joal-alextabstract-CustomJavaCode.java
+ManualStaticInit ALExtAbstractImpl
 
 # These routines use or return strings
 ArgumentIsString alcLoopbackOpenDeviceSOFT 0
diff --git a/make/config/joal-alextabstract-CustomJavaCode.java b/make/config/joal-alextabstract-CustomJavaCode.java
index e467fc7..6648620 100644
--- a/make/config/joal-alextabstract-CustomJavaCode.java
+++ b/make/config/joal-alextabstract-CustomJavaCode.java
@@ -8,6 +8,9 @@ static {
                                       throw new RuntimeException("Couldn't instantiate ALExtProcAddressTable");
                                     }
                                     alExtProcAddressTable.reset(ALImpl.alDynamicLookupHelper);
+                                    if( !initializeImpl() ) {
+                                        throw new RuntimeException("Initialization failure");
+                                    }                                      
                                     return alExtProcAddressTable;
                                 } } );
 }
diff --git a/make/config/joal.cfg b/make/config/joal.cfg
index 661b84e..0128dd9 100755
--- a/make/config/joal.cfg
+++ b/make/config/joal.cfg
@@ -29,7 +29,8 @@ Import java.security.PrivilegedAction
 # Factor out the OpenAL constants into their own interface
 Ignore ^AL_.+
 
-IncludeAs CustomJavaCode ALImpl joal-common-CustomJavaCode.java
+IncludeAs CustomJavaCode ALImpl joal-al-CustomJavaCode.java
+ManualStaticInit ALImpl
 
 # Provide #includes to native code
 CustomCCode #include "al.h"