Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25011/src/java/org/lwjgl
Modified Files:
LWJGLUtil.java
Log Message:
changed search order to:
1) Library path
2) Current dir
3) OS search
Index: LWJGLUtil.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/LWJGLUtil.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- LWJGLUtil.java 30 May 2005 16:21:03 -0000 1.6
+++ LWJGLUtil.java 20 Oct 2005 21:32:33 -0000 1.7
@@ -120,21 +120,31 @@
+ File.separator + platform_lib_name);
}
- //add cwd path
- possible_paths.add(platform_lib_name);
-
// Add all possible paths from java.library.path
String java_library_path = (String)AccessController.doPrivileged(new PrivilegedAction() {
public Object run() {
return System.getProperty("java.library.path");
}
});
+
StringTokenizer st = new StringTokenizer(java_library_path, File.pathSeparator);
while (st.hasMoreTokens()) {
String path = st.nextToken();
possible_paths.add(path + File.separator + platform_lib_name);
}
+ //add current path
+ String current_dir = (String)AccessController.doPrivileged(new PrivilegedAction() {
+ public Object run() {
+ return System.getProperty("user.dir");
+ }
+ });
+ possible_paths.add(current_dir + File.separator + platform_lib_name);
+
+
+ //add pure library (no path, let OS search)
+ possible_paths.add(platform_lib_name);
+
//create needed string array
String[] paths = new String[possible_paths.size()];
possible_paths.toArray(paths);
|
