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

native loading modified to be in line with oal

Browse source
This commit is contained in:
Brian Matzon 2004-09-19 11:17:28 +00:00
parent 4e81b3a458
commit e93393ef8a
5 changed files with 54 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/java/org/lwjgl/fmod3/FMOD.java
View file

@ -191,16 +191,16 @@ public class FMOD {
private static String JNI_LIBRARY_NAME = "lwjgl-fmod3";
/** The native library name on win32 */
private static String FMOD_WIN32_LIBRARY_NAME = "fmod.dll";
private static String FMOD_WIN32_LIBRARY_NAME = "fmod";
/** The native library name on win32 */
private static String FMOD_LINUX_LIBRARY_NAME = "libfmod.so.0";
private static String FMOD_LINUX_LIBRARY_NAME = "fmod";
/** The native library name on win32 */
private static String FMOD_OSX_LIBRARY_NAME = "fmod_cfm.shlb";
private static String FMOD_OSX_LIBRARY_NAME = "fmod";
/** Version of FMOD */
public static final String VERSION = "0.9a";
public static final String VERSION = "0.92";
static {
initialize();
@ -275,7 +275,8 @@ public class FMOD {
dllName = FMOD_LINUX_LIBRARY_NAME;
}
String jwsPath = getPathFromJWS(dllName.substring(0, dllName.indexOf(".")));
String jwsPath = getPathFromJWS(dllName);
Sys.log("getPathFromJWS: Paths found: " + jwsPath);
if (jwsPath != null) {
libpath += seperator
+ jwsPath.substring(0, jwsPath.lastIndexOf(File.separator));
@ -287,7 +288,11 @@ public class FMOD {
//build paths
for (int i = 0; i < paths.length - 1; i++) {
paths[i] = st.nextToken() + File.separator + dllName;
paths[i] = st.nextToken() + File.separator;
}
for(int i=0 ; i<paths.length; i++) {
Sys.log("Will search " + paths[i] + " for " + dllName);
}
//add cwd path
@ -323,7 +328,8 @@ public class FMOD {
* @return Absolute path to library if found, otherwise null
*/
private static String getPathFromJWS(String libname) {
try {
try {
Sys.log("getPathFromJWS: searching for: " + libname);
Object o = FMOD.class.getClassLoader();
Class c = o.getClass();
Method findLibrary =
@ -332,7 +338,7 @@ public class FMOD {
return (String) findLibrary.invoke(o, arguments);
} catch (Exception e) {
System.out.println("Failure locating FMOD using classloader:" + e);
Sys.log("Failure locating FMOD using classloader:" + e);
}
return null;
}

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

@ -146,6 +146,7 @@ public final class AL {
}
String jwsPath = getPathFromJWS(jwsLibname);
Sys.log("getPathFromJWS: Paths found: " + jwsPath);
if (jwsPath != null) {
libpath += seperator
+ jwsPath.substring(0, jwsPath.lastIndexOf(File.separator));
@ -160,6 +161,10 @@ public final class AL {
for (int i = 0; i < oalPaths.length - 1; i++) {
oalPaths[i] = st.nextToken() + File.separator;
}
for(int i=0 ; i<oalPaths.length; i++) {
Sys.log("Will search " + oalPaths[i] + " for " + jwsLibname);
}
//add cwd path
oalPaths[oalPaths.length - 1] = "";
@ -238,9 +243,7 @@ public final class AL {
*/
private static String getPathFromJWS(String libname) {
try {
Sys.log("JWS Classloader looking for: " + libname);
Sys.log("getPathFromJWS: searching for: " + libname);
Object o = AL.class.getClassLoader();
Class c = o.getClass();
Method findLibrary =