X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Flibraries.lisp;h=942f764b4ca53bc8a79ceccf8ee1e990f4d9c8a9;hb=fd405c886a22392634af58832d31cc809a1abd19;hp=f922b668d5ec22e4850f8ab5940b6fd9fdeefd5e;hpb=535491c5db05b0cae9aea892d652d73a9e1b0f19;p=uffi.git

diff --git a/src/libraries.lisp b/src/libraries.lisp
index f922b66..942f764 100644
--- a/src/libraries.lisp
+++ b/src/libraries.lisp
@@ -2,12 +2,12 @@
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
-;;;; Name:          libraries.cl
+;;;; Name:          libraries.lisp
 ;;;; Purpose:       UFFI source to load foreign libraries
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: libraries.lisp,v 1.5 2002/11/18 04:53:32 kevin Exp $
+;;;; $Id$
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -16,8 +16,7 @@
 ;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 ;;;; *************************************************************************
 
-(declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
-(in-package :uffi)
+(in-package #:uffi)
 
 (defvar *loaded-libraries* nil
   "List of foreign libraries loaded. Used to prevent reloading a library")
@@ -25,8 +24,15 @@
 (defun default-foreign-library-type ()
   "Returns string naming default library type for platform"
   #+(or win32 mswindows) "dll"
-  #+(or macosx darwin) "dylib"
-  #-(or win32 mswindows macosx darwin) "so"
+  #+(or macosx darwin ccl-5.0) "dylib"
+  #-(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)  
@@ -34,7 +40,7 @@
 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)
@@ -73,7 +79,7 @@ library type if type is not specified."
 
 (defun load-foreign-library (filename &key module supporting-libraries
 					   force-load)
-  #+(or allegro lispworks openmcl) (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))
@@ -86,12 +92,12 @@ library type if type is not specified."
       (progn
 	#+cmu
 	(let ((type (pathname-type (parse-namestring filename))))
-	  (if (equal type "so")
+	  (if (string-equal type "so")
 	      (sys::load-object-file filename)
-	    (alien:load-foreign filename 
-				:libraries
-				(convert-supporting-libraries-to-string
-				 supporting-libraries))))
+	      (alien:load-foreign filename 
+				  :libraries
+				  (convert-supporting-libraries-to-string
+				   supporting-libraries))))
 	#+scl
 	(let ((type (pathname-type (parse-namestring filename))))
 	  (alien:load-foreign filename 
@@ -99,10 +105,12 @@ library type if type is not specified."
 			      (convert-supporting-libraries-to-string
 			       supporting-libraries)))
 	#+sbcl
-	(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)