From 89d54d1b311bd78be53bef26e89cc4e871351caf Mon Sep 17 00:00:00 2001 From: Xerxes Rånby Date: Wed, 30 Jan 2013 15:27:43 +0100 Subject: Improve logic of Bug 662: Add a flag to favour OpenALSoft MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- .../jogamp/openal/ALDynamicLibraryBundleInfo.java | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'src/java') 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 alLibNames = new ArrayList(); 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 -- cgit v1.2.3