Add foreign library definitions for gdk-pixbuf and for win32 variants of libs

diff --git a/gdk/gdk.package.lisp b/gdk/gdk.package.lisp
index 554add8..272c0a8 100644 (file)
--- a/gdk/gdk.package.lisp
+++ b/gdk/gdk.package.lisp
@@ -15,6 +15,12 @@
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (define-foreign-library gdk
     (:unix (:or "libgdk-x11-2.0.so.0" "libgdk-x11-2.0.so"))
-    (t "libgdk-2.0")))
+    (:win32 "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"))
+    (:win32 (:or "libgdk-pixbuf-win32-2.0-0" "libgdk-pixbuf-2.0-0.dll"))
+    (t "libgdk_pixbuf-2.0")))
 
-(use-foreign-library gdk)
\ No newline at end of file
+(use-foreign-library gdk)
+(use-foreign-library gdk-pixbuf)
\ No newline at end of file

diff --git a/glib/glib.lisp b/glib/glib.lisp
index df8af72..5999997 100644 (file)
--- a/glib/glib.lisp
+++ b/glib/glib.lisp
@@ -67,13 +67,15 @@ In this example, for every @code{class}, @code{(initialize-gobject-class-g-type
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (define-foreign-library glib
     (:unix (:or "libglib-2.0.so.0" "libglib-2.0.so"))
-    (t "libglib-2.0")))
+    (:win32 "libglib-2.0-0.dll")
+    (t (:default "libglib-2.0"))))
 
 (use-foreign-library glib)
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (define-foreign-library gthread
     (:unix (:or "libgthread-2.0.so.0"  "libgthread-2.0.so"))
+    (:win32 "libgthread-2.0-0.dll")
     (t "libgthread-2.0")))
 
 (use-foreign-library gthread)

diff --git a/glib/gobject.init.lisp b/glib/gobject.init.lisp
index 34ae64f..ebf2ebf 100644 (file)
--- a/glib/gobject.init.lisp
+++ b/glib/gobject.init.lisp
@@ -6,6 +6,7 @@
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (cffi:define-foreign-library gobject
     (:unix (:or "libgobject-2.0.so.0" "libgobject-2.0.so"))
+    (:win32 "libgobject-2.0-0.dll")
     (t "libgobject-2.0")))
 
 (cffi:use-foreign-library gobject)

diff --git a/gtk-glext/gtkglext.package.lisp b/gtk-glext/gtkglext.package.lisp
index 5eadf2e..5d34a68 100644 (file)
--- a/gtk-glext/gtkglext.package.lisp
+++ b/gtk-glext/gtkglext.package.lisp
@@ -10,9 +10,11 @@
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (define-foreign-library gtkglext
     (:unix (:or "libgtkglext-x11-1.0.so.0" "libgtkglext-x11-1.0.so"))
+    (:win32 "libgtkglext-win32-1.0-0.dll")
     (t (:default "libgtkglext-1.0")))
   (define-foreign-library gdkglext
     (:unix (:or "libgdkglext-x11-1.0.so.0" "libgdkglext-x11-1.0.so"))
+    (:win32 "libgtkglext-win32-1.0-0.dll")
     (t (:default "libgdkglext-1.0"))))
 
 (use-foreign-library gtkglext)

diff --git a/gtk/gtk.package.lisp b/gtk/gtk.package.lisp
index 800eeb9..228a76f 100644 (file)
--- a/gtk/gtk.package.lisp
+++ b/gtk/gtk.package.lisp
@@ -34,6 +34,7 @@
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (define-foreign-library gtk
     (:unix (:or "libgtk-x11-2.0.so.0" "libgtk-x11-2.0.so"))
+    (:win32 (:or "libgtk-2.0-0.dll" "libgtk-win32-2.0-0.dll"))
     (t "libgtk-2.0")))
 
 (use-foreign-library gtk)