X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/d9a7b2f889a946b9d91fd63fc687ed8dced85c62..c0bc39e53c16a7e408b7bb0ecb13dc605f0b8ea4:/gtk/gtk.asd

diff --git a/gtk/gtk.asd b/gtk/gtk.asd
index db9ae6c..49de599 100644
--- a/gtk/gtk.asd
+++ b/gtk/gtk.asd
@@ -3,29 +3,33 @@
 (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"))
-		 (:unix-dso "alien"
-			    :components ((:c-source-file "glue"
-					  :cflags #.(pkg-cflags "gtk+-2.0")))
-			    :depends-on ("libgtk-x11-2.0"))
-		 (:file "gtkobject" 
-			:depends-on ("defpackage" "alien"))
+		 (:library "libgtk-2.0" 
+		  :libdir #.(pkg-libdir "gtk+-2.0")
+		  :libname #-win32 "libgtk-x11-2.0"
+		           #+win32 "libgtk-win32-2.0-0")
+		 (:shared-object "gtk-alien" :pathname "alien/"
+		  :ldflags #.(pkg-libs "gtk+-2.0")
+		  :components ((:c-source-file "glue"
+				:cflags #.(pkg-cflags "gtk+-2.0")))
+		  :depends-on (#+cmu "libgtk-2.0"))
+		 (:file "gtkobject" :depends-on ("defpackage" "gtk-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"))))