X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fmcl%2Flibraries.cl;h=bdd8682388b4c715113d55aaab3427ea3bb88067;hb=4464cb9bed614c141d39ffaf72328cfc4d5a1452;hp=c05f7e6f62e90f0de56dd9cbe771cf2429c1e429;hpb=1cc53427ced49872fe8d0377373dad84751d178b;p=uffi.git

diff --git a/src/mcl/libraries.cl b/src/mcl/libraries.cl
index c05f7e6..bdd8682 100644
--- a/src/mcl/libraries.cl
+++ b/src/mcl/libraries.cl
@@ -7,7 +7,7 @@
 ;;;; Programmers:   Kevin M. Rosenberg and John DeSoi
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: libraries.cl,v 1.3 2002/04/06 19:11:15 kevin 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
@@ -30,8 +30,51 @@
      (when (ccl:add-to-shared-library-search-path ,filename t) 
        (pushnew ,filename *loaded-libraries*))))
 
-(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 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)
+
+
+;; 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