X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Flibraries.lisp;h=942f764b4ca53bc8a79ceccf8ee1e990f4d9c8a9;hb=212e27b1cad10c503a9231fe6b7819e6945505c7;hp=5e72a920ef96c89bd0d0c42b7592843a52f81615;hpb=0a8dea50aae12c02abb585e78d130f7af937140f;p=uffi.git

diff --git a/src/libraries.lisp b/src/libraries.lisp
index 5e72a92..942f764 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.11 2003/08/26 17:39:47 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)
@@ -98,14 +105,12 @@ library type if type is not specified."
 			      (convert-supporting-libraries-to-string
 			       supporting-libraries)))
 	#+sbcl
-	(let ((type (pathname-type (parse-namestring filename))))
-	  (if (or (string-equal type "so")
-		  (string-equal type "dylib"))
-	      (sb-alien::load-1-foreign filename)
-	      (sb-alien:load-foreign filename 
-				     :libraries
-				     (convert-supporting-libraries-to-string
-				      supporting-libraries))))
+	(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)
 	#+allegro (load filename)
 	#+openmcl (ccl:open-shared-library filename)