From 8439e722b78d26a4ae9b290373acb71920af2262 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Wed, 3 Apr 2002 17:43:31 +0000 Subject: [PATCH] r1734: *** empty log message *** --- examples/Makefile | 9 +++++++-- src/libraries.cl | 6 ++++-- tests/Makefile | 9 +++++++-- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/examples/Makefile b/examples/Makefile index 185a5a5..9aefd1f 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -5,7 +5,7 @@ # Programer: Kevin M. Rosenberg # Date Started: Mar 2002 # -# CVS Id: $Id: Makefile,v 1.10 2002/04/03 06:10:50 kevin Exp $ +# CVS Id: $Id: Makefile,v 1.11 2002/04/03 17:43:31 kevin Exp $ # # This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg # @@ -14,13 +14,18 @@ # (http://opensource.franz.com/preamble.html), also known as the LLGPL. -# These variables are correct for GCC +# GCC Section CC=gcc SHARED_CC_OPT=-fPIC -DPIC #SHARED_LD_OPT=-r -Bdynamic # For FreeBSD and Solaris (CMUCL) SHARED_LD_OPT=-shared -Bdynamic # For Linux (ALL) and FreeBSD (ACL) +# For MacOSX (ACL) +#SHARED_CC_OPT=-dynamic +#SHARED_LD_OPT=-bundle /usr/lib/bundle1.o -undefined suppress # -o foo.dylib foo.o + + # Use these for Sun's C compiler and Solaris (ACL) #CC=cc #SHARED_CC_OPT=-KPIC diff --git a/src/libraries.cl b/src/libraries.cl index e5bb757..05ca125 100644 --- a/src/libraries.cl +++ b/src/libraries.cl @@ -7,7 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: libraries.cl,v 1.11 2002/04/01 20:40:36 kevin Exp $ +;;;; $Id: libraries.cl,v 1.12 2002/04/03 17:43:31 kevin Exp $ ;;;; ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; @@ -83,10 +83,12 @@ library type if type is not specified." (find filename *loaded-libraries* :test #'string-equal)) t ;; return T, but don't reload library (progn - #+cmu (alien:load-foreign filename + #+(and ignore cmu) (alien:load-foreign filename :libraries (convert-supporting-libraries-to-string supporting-libraries)) + #+cmu (sys::load-object-file filename) + #+lispworks (fli:register-module module :connection-style :automatic :real-name filename) diff --git a/tests/Makefile b/tests/Makefile index 185a5a5..9aefd1f 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -5,7 +5,7 @@ # Programer: Kevin M. Rosenberg # Date Started: Mar 2002 # -# CVS Id: $Id: Makefile,v 1.10 2002/04/03 06:10:50 kevin Exp $ +# CVS Id: $Id: Makefile,v 1.11 2002/04/03 17:43:31 kevin Exp $ # # This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg # @@ -14,13 +14,18 @@ # (http://opensource.franz.com/preamble.html), also known as the LLGPL. -# These variables are correct for GCC +# GCC Section CC=gcc SHARED_CC_OPT=-fPIC -DPIC #SHARED_LD_OPT=-r -Bdynamic # For FreeBSD and Solaris (CMUCL) SHARED_LD_OPT=-shared -Bdynamic # For Linux (ALL) and FreeBSD (ACL) +# For MacOSX (ACL) +#SHARED_CC_OPT=-dynamic +#SHARED_LD_OPT=-bundle /usr/lib/bundle1.o -undefined suppress # -o foo.dylib foo.o + + # Use these for Sun's C compiler and Solaris (ACL) #CC=cc #SHARED_CC_OPT=-KPIC -- 2.34.1