X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fmcl%2Flibraries.cl;h=bdd8682388b4c715113d55aaab3427ea3bb88067;hb=00611b4cf8bae33b1db2d048b589c7505b0abfb1;hp=7d6dbf238a9aefedec22edf1f7b6947bfd78cfa8;hpb=5bd05c7e835ff4ce78e6eb9c928a6f71471ce528;p=uffi.git

diff --git a/src/mcl/libraries.cl b/src/mcl/libraries.cl
index 7d6dbf2..bdd8682 100644
--- a/src/mcl/libraries.cl
+++ b/src/mcl/libraries.cl
@@ -4,12 +4,13 @@
 ;;;;
 ;;;; Name:          libraries.cl
 ;;;; Purpose:       UFFI source to load foreign libraries
-;;;; Programmer:    Kevin M. Rosenberg
+;;;; Programmers:   Kevin M. Rosenberg and John DeSoi
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: libraries.cl,v 1.1 2002/04/04 05:02:03 desoi Exp $
+;;;; $Id: libraries.cl,v 1.5 2002/04/23 00:31:42 desoi Exp $
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
+;;;; and John DeSoi
 ;;;;
 ;;;; UFFI users are granted the rights to distribute and use this software
 ;;;; as governed by the terms of the Lisp Lesser GNU Public License
@@ -22,15 +23,58 @@
 (defvar *loaded-libraries* nil
   "List of foreign libraries loaded. Used to prevent reloading a library")
 
-
+;in MCL calling this more than once for the same library does not do anything
 (defmacro load-foreign-library (filename &key module supporting-libraries)
   (declare (ignore module supporting-libraries))
   `(eval-when (:compile-toplevel :load-toplevel :execute)
-     (when (ccl:add-to-shared-library-search-path ,filename t)
-       (pushnew filename *loaded-libraries*))))
+     (when (ccl:add-to-shared-library-search-path ,filename t) 
+       (pushnew ,filename *loaded-libraries*))))
+
+;; Copied directly from main source without MCL specializations
+(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)))
+  (unless (listp types)
+    (setq types (list types)))
+  (unless (listp names)
+    (setq names (list names)))
+  (unless (listp directories)
+    (setq directories (list directories)))
+  #+(or win32 mswindows)
+  (unless (listp drive-letters)
+    (setq drive-letters (list drive-letters)))
+  #-(or win32 mswindows)
+  (setq drive-letters '(nil))
+  (dolist (drive-letter drive-letters)
+    (dolist (name names)
+      (dolist (dir directories)
+	(dolist (type types)
+	  (let ((path (make-pathname 
+		       #+lispworks :host
+		       #+lispworks (when drive-letter drive-letter)
+		       #-lispworks :device
+		       #-lispworks (when drive-letter drive-letter)
+		       :name name 
+		       :type type
+		       :directory 
+		       (etypecase dir
+			 (pathname
+			  (pathname-directory dir))
+			 (list
+			  dir)
+			 (string
+			  (pathname-directory 
+			   (parse-namestring dir)))))))
+	    (when (probe-file path)
+	      (return-from find-foreign-library path)))))))
+   nil)
+
 
-(defun convert-supporting-libraries-to-string (libs)
-  (let (lib-load-list)
-    (dolist (lib libs)
-      (push (format nil "-l~A" lib) lib-load-list))
-    (nreverse lib-load-list)))
+;; Copied directly from main source without MCL specializations
+(defun default-foreign-library-type ()
+  "Returns string naming default library type for platform"
+  #+(or win32 mswindows) "dll"
+  #-(or win32 mswindows) "so")
\ No newline at end of file