diff options
| author | Sven Gothel <[email protected]> | 2014-06-18 03:48:11 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2014-06-18 03:48:11 +0200 |
| commit | 21cd5206625aaa8914e53bdfaab8e7ae4e497a08 (patch) | |
| tree | b45c751e459fadc694053ba7ddd39dd4a4562043 | |
| parent | 05d236515d37561a66b1e239984916e95a193cc8 (diff) | |
Adapt to GlueGen commit 2f6586292cd298bbc19d8acda0f7cf303c82078b (compount call-by-value extension)
- initializeImpl() is no more required, since it's not forced .. uncomment in manual static initializer
| -rw-r--r-- | make/config/joal-al-CustomJavaCode.java | 3 | ||||
| -rwxr-xr-x | make/config/joal-alc.cfg | 2 | ||||
| -rwxr-xr-x | make/config/joal-alcabstract-CustomJavaCode.java | 3 | ||||
| -rw-r--r-- | make/config/joal-alext.cfg | 2 | ||||
| -rw-r--r-- | make/config/joal-alextabstract-CustomJavaCode.java | 3 | ||||
| -rwxr-xr-x | make/config/joal.cfg | 2 |
6 files changed, 9 insertions, 6 deletions
diff --git a/make/config/joal-al-CustomJavaCode.java b/make/config/joal-al-CustomJavaCode.java index 551e51a..312a23d 100644 --- a/make/config/joal-al-CustomJavaCode.java +++ b/make/config/joal-al-CustomJavaCode.java @@ -20,9 +20,10 @@ static { throw new RuntimeException("Couln't load native AL/JNI glue library"); } alProcAddressTable.reset(bundle); + /** Not required nor forced if( !initializeImpl() ) { throw new RuntimeException("Initialization failure"); - } + } */ return bundle; } } ); } diff --git a/make/config/joal-alc.cfg b/make/config/joal-alc.cfg index be27733..7858c46 100755 --- a/make/config/joal-alc.cfg +++ b/make/config/joal-alc.cfg @@ -42,7 +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 +ManualStaticInitCall 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 f0a7173..aaa6464 100755 --- a/make/config/joal-alcabstract-CustomJavaCode.java +++ b/make/config/joal-alcabstract-CustomJavaCode.java @@ -8,9 +8,10 @@ static { throw new RuntimeException("Couldn't instantiate ALCProcAddressTable"); } alcProcAddressTable.reset(ALImpl.alDynamicLookupHelper); + /** Not required nor forced if( !initializeImpl() ) { throw new RuntimeException("Initialization failure"); - } + } */ return alcProcAddressTable; } } ); } diff --git a/make/config/joal-alext.cfg b/make/config/joal-alext.cfg index a775c4b..80e7ccc 100644 --- a/make/config/joal-alext.cfg +++ b/make/config/joal-alext.cfg @@ -39,7 +39,7 @@ Ignore ^AL_.+ Ignore ^ALC_.+ IncludeAs CustomJavaCode ALExtAbstractImpl joal-alextabstract-CustomJavaCode.java -ManualStaticInit ALExtAbstractImpl +ManualStaticInitCall 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 6648620..19b42ab 100644 --- a/make/config/joal-alextabstract-CustomJavaCode.java +++ b/make/config/joal-alextabstract-CustomJavaCode.java @@ -8,9 +8,10 @@ static { throw new RuntimeException("Couldn't instantiate ALExtProcAddressTable"); } alExtProcAddressTable.reset(ALImpl.alDynamicLookupHelper); + /** Not required nor forced if( !initializeImpl() ) { throw new RuntimeException("Initialization failure"); - } + } */ return alExtProcAddressTable; } } ); } diff --git a/make/config/joal.cfg b/make/config/joal.cfg index 0128dd9..ac368a3 100755 --- a/make/config/joal.cfg +++ b/make/config/joal.cfg @@ -30,7 +30,7 @@ Import java.security.PrivilegedAction Ignore ^AL_.+ IncludeAs CustomJavaCode ALImpl joal-al-CustomJavaCode.java -ManualStaticInit ALImpl +ManualStaticInitCall ALImpl # Provide #includes to native code CustomCCode #include "al.h" |