From: Igor Zubkov <igor.zubkov@gmail.com>
Date: Mon, 14 Mar 2011 00:18:46 +0000 (+0800)
Subject: Fixes for Darwin/OSX.
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=224e807f5255fb98f4cdb1ab9ba9684630465fa2;p=cl-gtk2.git

Fixes for Darwin/OSX.
---

diff --git a/gdk/gdk.package.lisp b/gdk/gdk.package.lisp
index 3de1687..0e4f12b 100644
--- a/gdk/gdk.package.lisp
+++ b/gdk/gdk.package.lisp
@@ -8,16 +8,19 @@
 (glib:at-init ()
   (eval-when (:compile-toplevel :load-toplevel :execute)
     (define-foreign-library gdk
-      (:unix (:or "libgdk-x11-2.0.so.0" "libgdk-x11-2.0.so"))
+      ((:and :unix (:not :darwin)) (:or "libgdk-x11-2.0.so.0" "libgdk-x11-2.0.so"))
+      (:darwin (:or "libgdk-x11-2.0.0.dylib" "libgdk-x11-2.0.dylib"))
       (:windows "libgdk-win32-2.0-0.dll")
       (t "libgdk-2.0"))
     (define-foreign-library gdk-pixbuf
-      (:unix (:or "libgdk_pixbuf-2.0.so.0" "libgdk_pixbuf-2.0.so"))
+      ((:and :unix (:not :darwin)) (:or "libgdk_pixbuf-2.0.so.0" "libgdk_pixbuf-2.0.so"))
+      (:darwin (:or "libgdk_pixbuf-2.0.0.dylib" "libgdk_pixbuf-2.0.dylib"))
       (:windows (:or "libgdk_pixbuf-win32-2.0-0" "libgdk_pixbuf-2.0-0.dll"))
       (t "libgdk_pixbuf-2.0"))
-   
+
     (define-foreign-library gtk
-      (:unix (:or "libgtk-x11-2.0.so.0" "libgtk-x11-2.0.so"))
+      ((:and :unix (:not :darwin)) (:or "libgtk-x11-2.0.so.0" "libgtk-x11-2.0.so"))
+      (:darwin (:or "libgtk-x11-2.0.0.dylib" "libgtk-x11-2.0.dylib"))
       (:windows (:or "libgtk-2.0-0.dll" "libgtk-win32-2.0-0.dll"))
       (t "libgtk-2.0")))
 
diff --git a/glib/glib.lisp b/glib/glib.lisp
index cdd1d1a..bf6e9d6 100644
--- a/glib/glib.lisp
+++ b/glib/glib.lisp
@@ -101,12 +101,14 @@ In this example, for every @code{class}, @code{(initialize-gobject-class-g-type
 (at-init ()
   (eval-when (:compile-toplevel :load-toplevel :execute)
     (define-foreign-library glib
-      (:unix (:or "libglib-2.0.so.0" "libglib-2.0.so"))
+      ((:and :unix (:not :darwin)) (:or "libglib-2.0.so.0" "libglib-2.0.so"))
+      (:darwin (:or "libglib-2.0.0.dylib" "libglib-2.0.dylib"))
       (:windows "libglib-2.0-0.dll")
       (t (:default "libglib-2.0"))))
   (eval-when (:compile-toplevel :load-toplevel :execute)
     (define-foreign-library gthread
-      (:unix (:or "libgthread-2.0.so.0"  "libgthread-2.0.so"))
+      ((:and :unix (:not :darwin))  (:or "libgthread-2.0.so.0"  "libgthread-2.0.so"))
+      (:darwin (:or "libgthread-2.0.0.dylib"  "libgthread-2.0.dylib"))
       (:windows "libgthread-2.0-0.dll")
       (t "libgthread-2.0")))
 
diff --git a/glib/gobject.init.lisp b/glib/gobject.init.lisp
index 9c94cf9..aabf1f7 100644
--- a/glib/gobject.init.lisp
+++ b/glib/gobject.init.lisp
@@ -6,7 +6,8 @@
 (at-init ()
  (eval-when (:compile-toplevel :load-toplevel :execute)
    (cffi:define-foreign-library gobject
-     (:unix (:or "libgobject-2.0.so.0" "libgobject-2.0.so"))
+     ((:and :unix (:not :darwin)) (:or "libgobject-2.0.so.0" "libgobject-2.0.so"))
+     (:darwin (:or "libgobject-2.0.0.dylib" "libgobject-2.0.dylib"))
      (:windows "libgobject-2.0-0.dll")
      (t "libgobject-2.0")))
 
diff --git a/pango/pango.init.lisp b/pango/pango.init.lisp
index 760e3fe..a64c5ea 100644
--- a/pango/pango.init.lisp
+++ b/pango/pango.init.lisp
@@ -3,7 +3,8 @@
 (glib:at-init ()
   (eval-when (:compile-toplevel :load-toplevel :execute)
     (define-foreign-library pango
-      (:unix "libpango-1.0.so.0")
+      ((:and :unix (:not :darwin)) "libpango-1.0.so.0")
+      (:darwin (:or "libpango-1.0.0.dylib" "libpango-1.0.dylib"))
       (:windows "libpango-1.0-0.dll")
       (t (:default "libgpango-1.0"))))