summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorXerxes Rånby <[email protected]>2013-01-30 15:08:56 +0100
committerXerxes Rånby <[email protected]>2013-01-30 15:08:56 +0100
commit15583ca328c416bf664396025086a60afb34bd84 (patch)
treeb235a9f7d9b54ac5b0d6c4bd198ed6ff4a5cdfde /src
parent1bc6cc4395a998440e48f45f06bf9d80cf3de6e1 (diff)
Bug 662: Add a flag to favour OpenALSoft
If the property jnlp.joal.SystemOpenAL or -Djoal.SystemOpenAL is defined then include the system OpenAL libnames. This will favour use of the bundled OpenALSoft by default. Signed-off-by: Xerxes Rånby <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/java/jogamp/openal/ALDynamicLibraryBundleInfo.java20
1 files changed, 11 insertions, 9 deletions
diff --git a/src/java/jogamp/openal/ALDynamicLibraryBundleInfo.java b/src/java/jogamp/openal/ALDynamicLibraryBundleInfo.java
index 53aed12..70ca34b 100644
--- a/src/java/jogamp/openal/ALDynamicLibraryBundleInfo.java
+++ b/src/java/jogamp/openal/ALDynamicLibraryBundleInfo.java
@@ -80,15 +80,17 @@ public class ALDynamicLibraryBundleInfo implements DynamicLibraryBundleInfo {
List<String> alLibNames = new ArrayList<String>();
- // 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");
+ if(isPropertyDefined("joal.SystemOpenAL", true) {
+ // 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
alLibNames.add("openal");