X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Flibraries.lisp;h=3ca10dac05b35b1ba1ad9aed57e61b2aa90f7122;hb=55e1a4c1af5cb469357bb69543d89ad2dee48cc1;hp=094433548d3d14532bd13dba8bdfcd9609c477d7;hpb=77fd04d570b9ae1fd40c1f7b0134af826576210b;p=uffi.git

diff --git a/src/libraries.lisp b/src/libraries.lisp
index 0944335..3ca10da 100644
--- a/src/libraries.lisp
+++ b/src/libraries.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: libraries.lisp,v 1.10 2003/08/14 19:35:05 kevin Exp $
+;;;; $Id$
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -28,12 +28,19 @@
   #-(or win32 mswindows macosx darwin ccl-5.0) "so"
 )
 
+(defun foreign-library-types ()
+  "Returns list of string naming possible library types for platform, sorted by preference"
+  #+(or win32 mswindows) '("dll" "lib")
+  #+(or macosx darwin ccl-5.0) '("dylib" "bundle")
+  #-(or win32 mswindows macosx darwin ccl-5.0) '("so" "a" "o")
+)
+
 (defun find-foreign-library (names directories &key types drive-letters)  
   "Looks for a foreign library. directories can be a single
 string or a list of strings of candidate directories. Use default
 library type if type is not specified."
   (unless types
-    (setq types (default-foreign-library-type)))
+    (setq types (foreign-library-types)))
   (unless (listp types)
     (setq types (list types)))
   (unless (listp names)
@@ -74,10 +81,13 @@ library type if type is not specified."
 					   force-load)
   #+(or allegro mcl) (declare (ignore module supporting-libraries))
   #+(or cmu scl sbcl) (declare (ignore module))
-  
-  (when (and filename (probe-file filename))
-    (if (pathnamep filename)    ;; ensure filename is a string to check if
-	(setq filename (namestring filename)))  ; already loaded
+  #+lispworks (declare (ignore supporting-libraries))
+
+  (when (and filename (or (null (pathname-directory filename))
+                          (probe-file filename)))
+    (if (pathnamep filename)    ;; ensure filename is a string to check if already loaded
+	(setq filename (namestring (if (null (pathname-directory filename))
+                                     filename (truename filename)))))
 
     (if (and (not force-load)
 	     (find filename *loaded-libraries* :test #'string-equal))
@@ -98,14 +108,14 @@ library type if type is not specified."
 			      (convert-supporting-libraries-to-string
 			       supporting-libraries)))
 	#+sbcl
-	(let ((type (pathname-type (parse-namestring filename))))
-	  (if (string-equal type "so")
-	      (sb-alien::load-1-foreign filename)
-	      (sb-alien:load-foreign filename 
-				     :libraries
-				     (convert-supporting-libraries-to-string
-				      supporting-libraries))))
-	#+lispworks (fli:register-module module :real-name filename)
+	(handler-case (sb-alien::load-1-foreign filename)
+	  (sb-int:unsupported-operator (c)
+	    (if (fboundp (intern "LOAD-SHARED-OBJECT" :sb-alien))
+		(funcall (intern "LOAD-SHARED-OBJECT" :sb-alien) filename)
+		(error c))))
+
+	#+lispworks (fli:register-module module :real-name filename
+                                                :connection-style :immediate)
 	#+allegro (load filename)
 	#+openmcl (ccl:open-shared-library filename)
 	#+(and mcl (not openmcl)) (ccl:add-to-shared-library-search-path filename t)