X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Flibraries.lisp;h=8fa6612477f727c40ee4afb924d682ff0892a74f;hb=25845009fdd5e3d2fbb875027d71fdd47d76ea13;hp=65b64b34e434b1d9523377c24d1590cdd56c3b1c;hpb=7653a03580807774202e699a091a2e8520db5cf8;p=uffi.git

diff --git a/src/libraries.lisp b/src/libraries.lisp
index 65b64b3..8fa6612 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.3 2002/10/14 03:07:41 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"
-  #+macosx "dylib"
-  #-(or win32 mswindows macosx) "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,8 +79,8 @@ 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 cmu sbcl) (declare (ignore module))
+  #+(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
@@ -86,17 +92,28 @@ 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 
+			      :libraries
+			      (convert-supporting-libraries-to-string
+			       supporting-libraries)))
 	#+sbcl
-	(sb-alien:load-foreign filename 
-			       :libraries
-				 (convert-supporting-libraries-to-string
-				  supporting-libraries))
+	(let ((type (pathname-type (parse-namestring filename))))
+	  (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
+				     (convert-supporting-libraries-to-string
+				      supporting-libraries))))
 	#+lispworks (fli:register-module module :real-name filename)
 	#+allegro (load filename)
 	#+openmcl (ccl:open-shared-library filename)