diff options
| author | Xerxes Rånby <[email protected]> | 2013-01-30 15:27:43 +0100 |
|---|---|---|
| committer | Xerxes Rånby <[email protected]> | 2013-01-30 15:27:43 +0100 |
| commit | 89d54d1b311bd78be53bef26e89cc4e871351caf (patch) | |
| tree | c23e13b7d0caf909f1d7055e14817ddcf0754e40 /src/java/jogamp | |
| parent | 05fc86e0ba315ed4202adfb85f017205fd8bea8d (diff) | |
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]>
Diffstat (limited to 'src/java/jogamp')
| -rw-r--r-- | src/java/jogamp/openal/ALDynamicLibraryBundleInfo.java | 22 |
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 |