Definition of EVENT-MASK moved to gdktypes.lisp and some other minor changes

[clg] / gdk / gdk.asd

diff --git a/gdk/gdk.asd b/gdk/gdk.asd
index 2ff5130976ffb824d51b84b2572abc10b2a8f5c1..5f04e4e390bcc7afa788afa2288871252778a090 100644 (file)
--- a/gdk/gdk.asd
+++ b/gdk/gdk.asd
@@ -1,31 +1,26 @@
 ;;; -*- 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 "gtk+-2.0" :atleast-version "2.4.0" :error t)
 
 (defsystem gdk
-    :depends-on (glib)
+    :depends-on (gffi glib pango #?(pkg-exists-p "gtk+-2.0" :atleast-version "2.8.0") cairo)
     :components ((:file "defpackage")
+                (:library "libgdk_pixbuf-2.0" 
+                          :libdir #.(pkg-variable "gtk+-2.0" "libdir"))
+                (:library "libgdk-x11-2.0" 
+                          :libdir #.(pkg-variable "gtk+-2.0" "libdir"))
                 (:unix-dso "alien"
-                 :components ((:c-source-file "glue"
-                               :cflags #.(pkg-cflags "gtk+-2.0"))))
-                (:file "gdktypes" :depends-on ("defpackage" "alien"))
+                           :components ((:c-source-file "glue"
+                                         :cflags #.(pkg-cflags "gtk+-2.0"))))
+                (:file "gdktypes" :depends-on ("defpackage" "alien" 
+                                               "libgdk_pixbuf-2.0" 
+                                               "libgdk-x11-2.0"))
                 (:file "gdkevents" :depends-on ("gdktypes"))
+                (:file "pixbuf" :depends-on ("gdktypes"))
                 (:file "gdk" :depends-on ("gdkevents"))
                 (:file "export" :depends-on ("gdkevents" "gdktypes" "gdk"))))