Skip to content
Snippets Groups Projects
Commit 2ea64e90 authored by Liam M. Healy's avatar Liam M. Healy
Browse files

Rename dependent system cffi-libffi, fix Darwin path

parent c1216004
No related branches found
No related tags found
No related merge requests found
;; Definition of GSLL system ;; Definition of GSLL system
;; Liam Healy ;; Liam Healy
;; Time-stamp: <2011-10-29 19:21:04EDT gsll.asd> ;; Time-stamp: <2012-02-05 16:50:51EST gsll.asd>
;; ;;
;; Copyright 2006, 2007, 2008, 2009, 2010, 2011 Liam M. Healy ;; Copyright 2006, 2007, 2008, 2009, 2010, 2011 Liam M. Healy
;; Distributed under the terms of the GNU General Public License ;; Distributed under the terms of the GNU General Public License
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
;; along with this program. If not, see <http://www.gnu.org/licenses/>. ;; along with this program. If not, see <http://www.gnu.org/licenses/>.
(eval-when (:compile-toplevel :load-toplevel :execute) (eval-when (:compile-toplevel :load-toplevel :execute)
(asdf:oos 'asdf:load-op :cffi-fsbv)) ; loads cff-grovel too, needed here (asdf:oos 'asdf:load-op :cffi-libffi)) ; loads cff-grovel too, needed here
(asdf:defsystem #:gsll (asdf:defsystem #:gsll
:name "GSLL" :name "GSLL"
......
;; Load GSL ;; Load GSL
;; Liam Healy Sat Mar 4 2006 - 18:53 ;; Liam Healy Sat Mar 4 2006 - 18:53
;; Time-stamp: <2012-01-13 12:03:27EST init.lisp> ;; Time-stamp: <2012-02-19 10:35:34EST init.lisp>
;; ;;
;; Copyright 2006, 2007, 2008, 2009, 2010, 2011 Liam M. Healy ;; Copyright 2006, 2007, 2008, 2009, 2010, 2011 Liam M. Healy
;; Distributed under the terms of the GNU General Public License ;; Distributed under the terms of the GNU General Public License
...@@ -67,8 +67,8 @@ ...@@ -67,8 +67,8 @@
(cffi:define-foreign-library libgslcblas (cffi:define-foreign-library libgslcblas
(:darwin #+ccl #.(ccl:native-translated-namestring (:darwin #+ccl #.(ccl:native-translated-namestring
(gsl-config-pathname "lib/libgslcblas.dylib")) (gsl-config-pathname "libgslcblas.dylib"))
#-ccl #.(gsl-config-pathname "lib/libgslcblas.dylib")) #-ccl #.(gsl-config-pathname "libgslcblas.dylib"))
(:cygwin "cyggslcblas-0.dll") (:cygwin "cyggslcblas-0.dll")
(:unix (:or "libgslcblas.so.0" "libgslcblas.so")) (:unix (:or "libgslcblas.so.0" "libgslcblas.so"))
(t (:default "libgslcblas"))) (t (:default "libgslcblas")))
...@@ -83,8 +83,8 @@ ...@@ -83,8 +83,8 @@
(cffi:define-foreign-library libgsl (cffi:define-foreign-library libgsl
(:darwin #+ccl #.(ccl:native-translated-namestring (:darwin #+ccl #.(ccl:native-translated-namestring
(gsl-config-pathname "lib/libgsl.dylib")) (gsl-config-pathname "libgsl.dylib"))
#-ccl #.(gsl-config-pathname "lib/libgsl.dylib")) #-ccl #.(gsl-config-pathname "libgsl.dylib"))
(:cygwin "cyggsl-0.dll") (:cygwin "cyggsl-0.dll")
(:unix (:or "libgsl.so.0" "libgsl.so")) (:unix (:or "libgsl.so.0" "libgsl.so"))
(t (:default "libgsl"))) (t (:default "libgsl")))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment