From bf3a431ce7a7ec5641e3001da6c8f4ebfbaaf1fe Mon Sep 17 00:00:00 2001
From: Brian Matzon <brian@matzon.dk>
Date: Thu, 20 Oct 2005 21:32:33 +0000
Subject: [PATCH] changed search order to: 1) Library path 2) Current dir 3) OS
 search

---
 src/java/org/lwjgl/LWJGLUtil.java | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/java/org/lwjgl/LWJGLUtil.java b/src/java/org/lwjgl/LWJGLUtil.java
index a796ad8c..5bce392a 100644
--- a/src/java/org/lwjgl/LWJGLUtil.java
+++ b/src/java/org/lwjgl/LWJGLUtil.java
@@ -120,21 +120,31 @@ public class LWJGLUtil {
 					+ 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);