shadowfacts/lwjgl2-arm64
1
0
Fork 0
mirror of https://github.com/shadowfacts/lwjgl2-arm64.git synced 2026-04-05 14:35:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

OpenAL: Moved more library loading from native to java

Browse source
This commit is contained in:
Elias Naur 2005-03-09 13:06:17 +00:00
parent 5e98b4fda6
commit 7251a38930
3 changed files with 42 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

63
src/java/org/lwjgl/openal/AL.java
View file

@ -35,6 +35,9 @@ import java.io.File;
import java.lang.reflect.Method;
import java.util.StringTokenizer;
import java.util.List;
import java.util.ArrayList;
import org.lwjgl.LWJGLException;
import org.lwjgl.Sys;
@ -130,49 +133,49 @@ public final class AL {
private static String[] getOALPaths() throws LWJGLException {
// need to pass path of possible locations of OAL to native side
String libpath = System.getProperty("java.library.path");
String seperator = System.getProperty("path.separator");
String jwsLibname;
List possible_paths = new ArrayList();
String osName = System.getProperty("os.name");
String libname;
if (osName.startsWith("Win")) {
jwsLibname = "lwjglaudio";
libname = "lwjglaudio";
} else if (osName.startsWith("Lin")) {
jwsLibname = "openal";
libname = "openal";
} else if (osName.startsWith("Mac")) {
jwsLibname = "openal";
libname = "openal";
} else {
throw new LWJGLException("Unknown platform: "+osName);
}
String jwsPath = getPathFromClassLoader(jwsLibname);
if (jwsPath != null) {
Sys.log("getPathFromClassLoader: Path found: " + jwsPath);
libpath += seperator
+ jwsPath.substring(0, jwsPath.lastIndexOf(File.separator));
}
String lwjgl_jws_path = getPathFromClassLoader("lwjgl");
if (lwjgl_jws_path != null) {
Sys.log("getPathFromClassLoader: Path found: " + lwjgl_jws_path);
libpath += seperator
+ lwjgl_jws_path.substring(0, lwjgl_jws_path.lastIndexOf(File.separator));
}
StringTokenizer st = new StringTokenizer(libpath, seperator);
String platform_lib_name = System.mapLibraryName(libname);
//create needed string array
String[] oalPaths = new String[st.countTokens() + 1];
//build paths
for (int i = 0; i < oalPaths.length - 1; i++) {
oalPaths[i] = st.nextToken() + File.separator;
// Add all possible paths from java.library.path
String java_library_path = System.getProperty("java.library.path");
StringTokenizer st = new StringTokenizer(System.getProperty("java.library.path"), File.pathSeparator);
while (st.hasMoreTokens()) {
String path = st.nextToken();
possible_paths.add(path + File.separator + platform_lib_name);
}
for(int i=0 ; i<oalPaths.length; i++) {
Sys.log("Will search " + oalPaths[i] + " for " + jwsLibname);
String classloader_path = getPathFromClassLoader(libname);
if (classloader_path != null) {
Sys.log("getPathFromClassLoader: Path found: " + classloader_path);
possible_paths.add(classloader_path);
}
String lwjgl_classloader_path = getPathFromClassLoader("lwjgl");
if (lwjgl_classloader_path != null) {
Sys.log("getPathFromClassLoader: Path found: " + lwjgl_classloader_path);
possible_paths.add(lwjgl_classloader_path.substring(0, lwjgl_classloader_path.lastIndexOf(File.separator))
+ File.separator + platform_lib_name);
}
//add cwd path
oalPaths[oalPaths.length - 1] = "";
possible_paths.add(platform_lib_name);
//create needed string array
String[] oalPaths = new String[possible_paths.size()];
possible_paths.toArray(oalPaths);
return oalPaths;
}