X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Flibraries.lisp;h=8fa6612477f727c40ee4afb924d682ff0892a74f;hb=1330decaa5c85fe9eda4f8933269e2dbaae2f7a7;hp=ff14928674c5cd4c438b3aed24b69eacfc69ed5d;hpb=c1f5fa10b352b00c916dcf388be5ad1f49240a2c;p=uffi.git

diff --git a/src/libraries.lisp b/src/libraries.lisp
index ff14928..8fa6612 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.9 2003/07/08 12:37:21 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)
@@ -72,7 +79,7 @@ library type if type is not specified."
 
 (defun load-foreign-library (filename &key module supporting-libraries
 					   force-load)
-  #+(or allegro lispworks mcl) (declare (ignore module supporting-libraries))
+  #+(or allegro mcl) (declare (ignore module supporting-libraries))
   #+(or cmu scl sbcl) (declare (ignore module))
   
   (when (and filename (probe-file filename))
@@ -99,7 +106,9 @@ library type if type is not specified."
 			       supporting-libraries)))
 	#+sbcl
 	(let ((type (pathname-type (parse-namestring filename))))
-	  (if (string-equal type "so")
+	  (if (or (string-equal type "so")
+		  (string-equal type "bundle")
+		  (string-equal type "dylib"))
 	      (sb-alien::load-1-foreign filename)
 	      (sb-alien:load-foreign filename 
 				     :libraries