Instances of TREE-ITER properly allocated as memory slices

[clg] / gtk / gtk.asd

diff --git a/gtk/gtk.asd b/gtk/gtk.asd
index db9ae6c26946e9955df0058490b3db7482e03fae..f56cde8b5ca9f6f414c5cc751c04c18e95fbfb4d 100644 (file)
--- a/gtk/gtk.asd
+++ b/gtk/gtk.asd
@@ -3,29 +3,34 @@
 (asdf:oos 'asdf:load-op :clg-tools)
 
 (defpackage "GTK-SYSTEM"
-  (:use "COMMON-LISP" "ASDF" "PKG-CONFIG")
-  (:export "CLG-INIT"))
+  (:use "COMMON-LISP" "ASDF" "PKG-CONFIG"))
 
 (in-package "GTK-SYSTEM")
 
-(pkg-exists-p "gtk+-2.0" :atleast-version "2.4.0")
-
+(pkg-exists-p "gtk+-2.0" :atleast-version "2.4.0" :error t)
 
 (defsystem gtk
-    :depends-on (glib gdk pango atk)
+    :depends-on (gffi glib gdk pango atk)
     :components ((:file "defpackage")
-                (:library "libgtk-x11-2.0" 
-                          :libdir #.(pkg-variable "gtk+-2.0" "libdir"))
+                (:library "libgtk-2.0" 
+                          :libdir #.(pkg-libdir "gtk+-2.0")
+                          :libname #-win32 "libgtk-x11-2.0"
+                                   #+win32 "libgtk-win32-2.0-0")
                 (:unix-dso "alien"
+                           :ldflags #.(pkg-libs "gtk+-2.0")
                            :components ((:c-source-file "glue"
                                          :cflags #.(pkg-cflags "gtk+-2.0")))
-                           :depends-on ("libgtk-x11-2.0"))
+                           :depends-on (#+cmu "libgtk-2.0"))
                 (:file "gtkobject" 
-                       :depends-on ("defpackage" "alien"))
+                       :depends-on ("defpackage" "alien" "libgtk-2.0"))
                 (:file "gtktypes" :depends-on ("gtkobject"))
                 (:file "gtkwidget" :depends-on ("gtktypes"))
                 (:file "gtkcontainer" :depends-on ("gtktypes"))
-                (:file "gtk" :depends-on ("gtktypes"))
+                (:file "gtktree" :depends-on ("gtktypes"))
+                (:file "gtktext" :depends-on ("gtktypes"))
+                (:file "gtkaction" :depends-on ("gtktypes" "gtk"))
+                (:file "gtkselection" :depends-on ("gtktypes"))
+                (:file "gtkstyle" :depends-on ("gtktypes"))
+                (:file "gtk" :depends-on ("gtktypes" "gtkcontainer"))
                 (:file "gtkutils" :depends-on ("gtk"))
-                (:file "export" :depends-on ("gtktypes" "gtk")))
-    :perform (load-op :after (op gtk) (clg-init)))
+                (:file "export" :depends-on ("gtktypes" "gtkwidget" "gtkcontainer" "gtk" "gtktree" "gtkaction" "gtkselection" "gtkutils" "gtkstyle"))))