[cello-cvs] CVS cello/cl-magick

[fgoenninger]

Update of /project/cello/cvsroot/cello/cl-magick
In directory clnet:/tmp/cvs-serv29468

Modified Files:
	cl-magick.lisp 
Log Message:
Changed: +macosx instead of +darwin
Added: libWand.dylib for OS X needed
Changed: libMagick.dylib and libWand.dylib path defaults to /usr/local/lib on OS X now.

--- /project/cello/cvsroot/cello/cl-magick/cl-magick.lisp	2006/08/22 16:12:35	1.6
+++ /project/cello/cvsroot/cello/cl-magick/cl-magick.lisp	2006/08/23 20:17:30	1.7
@@ -20,6 +20,12 @@
 ;;; FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS 
 ;;; IN THE SOFTWARE.
 
+#+asdf
+(eval-when (:load-toplevel :compile-toplevel)
+  (asdf:operate 'asdf:load-op 'cffi)
+  (asdf:operate 'asdf:load-op 'cffi-extender)
+  (asdf:operate 'asdf:load-op 'kt-opengl)
+  (asdf:operate 'asdf:load-op 'gui-geometry))
 
 (defpackage :cl-magick
     (:nicknames :mgk)
@@ -59,12 +65,21 @@
 (defparameter *mgk-version* (fgn-alloc :unsigned-long 1))
 
 (cffi:define-foreign-library Magick
-  (:darwin (:or (:framework "GraphicsMagick") "libGraphicsMagick.dylib"))
+  (:darwin (:or "/usr/local/lib/libMagick.dylib"))
   (:windows (:or #+not "C:\\Program Files\\ImageMagick-6.2.7-Q8\\CORE_RL_wand_.dll"
               "C:\\Program Files\\GraphicsMagick-1.1.7-Q8\\CORE_RL_wand_.dll")))
 
-(eval-when (load eval)
-  (cffi:use-foreign-library magick))
+(cffi:define-foreign-library Wand
+  (:darwin (:or "/usr/local/lib/libWand.dylib")))
+
+;; Order matters! First, load Wand then Magick on Darwin
+#+macosx
+(eval-when (:load-toplevel :execute)
+  (cffi:use-foreign-library Wand))
+
+(eval-when (:load-toplevel :execute)
+  (cffi:use-foreign-library Magick))
+
 
 ;-------------------------------------------------------------------
 
@@ -85,7 +100,8 @@
 (cl-magick-init)
 
 (defun wands-loaded () *wands-loaded*)
-(DEFUN (setf wands-loaded) (new-value)
+
+(defun (setf wands-loaded) (new-value)
   (setf *wands-loaded* new-value))
 
 (defun wands-clear ()