X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Flibraries.lisp;h=56829a0155d6a287c6e21f6c769854070c12a138;hb=6c6ce0383c021a161278435ba068f1e291191bac;hp=65b64b34e434b1d9523377c24d1590cdd56c3b1c;hpb=7653a03580807774202e699a091a2e8520db5cf8;p=uffi.git diff --git a/src/libraries.lisp b/src/libraries.lisp index 65b64b3..56829a0 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.3 2002/10/14 03:07:41 kevin Exp $ +;;;; $Id: libraries.lisp,v 1.6 2002/11/20 21:01:31 kevin Exp $ ;;;; ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; @@ -25,8 +25,8 @@ (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 find-foreign-library (names directories &key types drive-letters) @@ -73,8 +73,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 lispworks 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 @@ -92,6 +92,12 @@ library type if type is not specified." :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