diff --git a/collects/ffi/magick.ss b/collects/ffi/magick.ss index 4aa3cab671..13bb216cdf 100644 --- a/collects/ffi/magick.ss +++ b/collects/ffi/magick.ss @@ -7,15 +7,14 @@ [exceptions '()]) (if (null? libs*) (error 'ffi-try-libs "Could not load any of the libraries in ~a\n~a\n" libs exceptions) - (let ([lib (car libs*)]) + (let ([lib (caar libs*)] + [version (cdar libs*)]) (with-handlers ([exn:fail:filesystem? (lambda (e) (loop (cdr libs*) (cons e exceptions)))]) - (ffi-lib lib)))))) - -;; Warning! This interface was written for libWand 6.0.1 -;; No guarantees are made about future compatibility -;; (define libwand (ffi-lib "libWand" "6.0.1")) -(define libwand (ffi-try-libs "libWand" "libMagickWand")) + (ffi-lib lib version)))))) + +(define libwand (ffi-try-libs '("libWand" "6.0.1" "6") + '("libMagickWand" "1"))) ;; ===== Main Objects =========================================================