diff options
| author | kbr <[email protected]> | 2006-09-03 06:37:20 +0000 |
|---|---|---|
| committer | kbr <[email protected]> | 2006-09-03 06:37:20 +0000 |
| commit | 4a4bcd2a1d71ea448e61bc6dc509bf9a4d6d59b1 (patch) | |
| tree | 56826a5edbb084919112b861ea9c243477527bbc | |
| parent | ca485a6483965b8c5d993b86e9a46729feb85a75 (diff) | |
Fixed run-time breakage due to NativeLibrary usage in JOAL. Added
search of Frameworks directory for NativeLibrary on Mac OS X.
git-svn-id: file:///home/mbien/NetBeansProjects/JOGAMP/joal-sync/git-svn/../svn-server-sync/joal/trunk@284 03bf7f67-59de-4072-a415-9a990d468a3f
| -rwxr-xr-x | make/build.xml | 7 | ||||
| -rwxr-xr-x | src/java/net/java/games/joal/impl/ALProcAddressLookup.java | 2 |
2 files changed, 2 insertions, 7 deletions
diff --git a/make/build.xml b/make/build.xml index f7acdee..145321e 100755 --- a/make/build.xml +++ b/make/build.xml @@ -281,7 +281,7 @@ <property name="java.includes.dir.platform" value="${java.includes.dir.macosx}" /> <property name="compiler.cfg.id" value="compiler.cfg.macosx" /> - <property name="linker.cfg.id" value="linker.cfg.macosx.joal" /> + <property name="linker.cfg.id" value="linker.cfg.macosx" /> </target> <target name="declare.freebsd" if="isFreeBSD"> @@ -434,11 +434,6 @@ <target name="c.configure" depends="gluegen.cpptasks.configure.compiler"> <!-- linker configuration --> - <linker id="linker.cfg.macosx.joal" extends="linker.cfg.macosx"> - <linkerarg value="-framework" /> - <linkerarg value="OpenAL" /> - </linker> - <patternset id="c.src.files.joal"> <include name="${rootrel.src.c}/*.c"/> <include name="${rootrel.generated.c.joal}/*.c"/> diff --git a/src/java/net/java/games/joal/impl/ALProcAddressLookup.java b/src/java/net/java/games/joal/impl/ALProcAddressLookup.java index 687e03b..5a188c7 100755 --- a/src/java/net/java/games/joal/impl/ALProcAddressLookup.java +++ b/src/java/net/java/games/joal/impl/ALProcAddressLookup.java @@ -57,7 +57,7 @@ public class ALProcAddressLookup { // We choose not to search the system path first because we // bundle a very recent version of OpenAL which we would like // to override existing installations - openAL = NativeLibrary.open("OpenAL32", "openal", "openal", + openAL = NativeLibrary.open("OpenAL32", "openal", "OpenAL", false, ALProcAddressLookup.class.getClassLoader()); if (openAL == null) { |