r6298: convert .cvsignore to svn:ignore properties

[uffi.git] / src / libraries.lisp

diff --git a/src/libraries.lisp b/src/libraries.lisp
index ff14928674c5cd4c438b3aed24b69eacfc69ed5d..592f08ca1f0d0db7f4ec9b69763595e74aa5955d 100644 (file)
--- 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: libraries.lisp,v 1.13 2003/08/27 20:02:59 kevin Exp $
 ;;;;
 ;;;; 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