Hopefully allow (require :glib) again.

[clg] / gdk / gdk.asd

diff --git a/gdk/gdk.asd b/gdk/gdk.asd
index 2ff5130976ffb824d51b84b2572abc10b2a8f5c1..849756c655b062bedbe58b8e53d2b26a82048af5 100644 (file)
--- a/gdk/gdk.asd
+++ b/gdk/gdk.asd
@@ -1,31 +1,34 @@
 ;;; -*- Mode: lisp -*-
 
 (defpackage "GDK-SYSTEM"
-  (:use "COMMON-LISP" "ASDF" "PKG-CONFIG" "SHAREDLIB"))
+  (:use "COMMON-LISP" "ASDF" "PKG-CONFIG"))
 
 (in-package "GDK-SYSTEM")
 
-(pkg-exists-p "gtk+-2.0" :atleast-version "2.4.0")
-
-
-(load-shared-library "libgdk_pixbuf-2.0")
-(load-shared-library "libgdk-x11-2.0"
-                    :init "gdk_init"
-                    :prototype '(alien:function
-                                 c-call:void
-                                 alien:system-area-pointer
-                                 alien:system-area-pointer)
-                    :initargs (list (system:int-sap 0) (system:int-sap 0)))
-
-
+(pkg-exists-p "gdk-2.0" :atleast-version "2.4.0" :error t)
 
 (defsystem gdk
-    :depends-on (glib)
+    :depends-on (gffi glib pango
+                #?(pkg-exists-p "gdk-2.0" :atleast-version "2.14.0")gio 
+                #?(pkg-exists-p "gdk-2.0" :atleast-version "2.8.0")cairo)
     :components ((:file "defpackage")
-                (:unix-dso "alien"
+                (:library "libgdk_pixbuf-2.0" 
+                 :libdir #.(pkg-libdir "gdk-2.0")
+                 :libname #-win32 "libgdk_pixbuf-2.0"
+                          #+win32 "libgdk_pixbuf-2.0-0")
+                (:library "libgdk-2.0" 
+                 :libdir #.(pkg-libdir "gdk-2.0")
+                 :libname #-win32 "libgdk-x11-2.0"
+                          #+win32 "libgdk-win32-2.0-0")
+                (:shared-object "gdk-alien" :pathname "alien/"
+                 :ldflags #.(pkg-libs "gdk-2.0")
                  :components ((:c-source-file "glue"
-                               :cflags #.(pkg-cflags "gtk+-2.0"))))
-                (:file "gdktypes" :depends-on ("defpackage" "alien"))
+                               :cflags #.(pkg-cflags "gdk-2.0")))
+                 :depends-on (#+cmu "libgdk-2.0"))
+                (:file "gdktypes" :depends-on ("defpackage" "gdk-alien" 
+                                               "libgdk_pixbuf-2.0" 
+                                               "libgdk-2.0"))
                 (:file "gdkevents" :depends-on ("gdktypes"))
+                (:file "pixbuf" :depends-on ("gdktypes"))
                 (:file "gdk" :depends-on ("gdkevents"))
-                (:file "export" :depends-on ("gdkevents" "gdktypes" "gdk"))))
+                (:file "export" :depends-on ("gdktypes" "gdkevents" "pixbuf" "gdk"))))