Improve logic of Bug 662: Add a flag to favour OpenALSoft

Default: prefer OpenAL-soft fallback to OpenAL System
If property joal.SystemOpenAL is defined:
then prefer OpenAL System fallback to OpenAL-soft

Signed-off-by: Xerxes Rånby <[email protected]>

1 files changed, 22 insertions, 0 deletions

diff --git a/src/java/jogamp/openal/ALDynamicLibraryBundleInfo.java b/src/java/jogamp/openal/ALDynamicLibraryBundleInfo.java
index 5d0d684..55f6ed7 100644
--- a/src/java/jogamp/openal/ALDynamicLibraryBundleInfo.java
+++ b/src/java/jogamp/openal/ALDynamicLibraryBundleInfo.java
@@ -81,6 +81,28 @@ public class ALDynamicLibraryBundleInfo implements DynamicLibraryBundleInfo  {
         List<String> alLibNames = new ArrayList<String>();
 
         if(Debug.isPropertyDefined("joal.SystemOpenAL", true)) {
+            // First test the System OpenAL 
+            // this is the default AL lib name, according to the spec
+            alLibNames.add("libopenal.so.1"); // unix
+            alLibNames.add("OpenAL32"); // windows
+            alLibNames.add("OpenAL"); // OSX
+
+            // try this one as well, if spec fails
+            alLibNames.add("libOpenAL.so.1");
+            alLibNames.add("libopenal.so");
+            alLibNames.add("libOpenAL.so");
+
+            // last but not least .. the generic one
+            // These names are in use by the bundled OpenAL-soft
+            alLibNames.add("openal");
+            alLibNames.add("OpenAL");
+        } else {
+            // First test use of the bundled OpenAL-soft
+            // the generic one
+            alLibNames.add("openal");
+            alLibNames.add("OpenAL");
+
+            // Then try the System OpenAL
             // this is the default AL lib name, according to the spec
             alLibNames.add("libopenal.so.1"); // unix
             alLibNames.add("OpenAL32"); // windows