X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/1d1ad56dc0f91c27b58e8a7dd376255ece823403..72d9260f8258b525339c7241da0631ceaf9f3842:/gtk/gtk.asd

diff --git a/gtk/gtk.asd b/gtk/gtk.asd
index d7aa92b..3dba691 100644
--- a/gtk/gtk.asd
+++ b/gtk/gtk.asd
@@ -12,23 +12,24 @@
 (defsystem gtk
     :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"
-			    :ldflags #.(pkg-libs "gtk+-2.0")
-			    :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 "gtktree" :depends-on ("gtktypes"))
 		 (:file "gtktext" :depends-on ("gtktypes"))
-		 (:file "gtkaction" :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" "gtkwidget" "gtkcontainer" "gtk" "gtktree" "gtkaction" "gtkselection" "gtkutils" "gtkstyle"))))
+		 (:file "export" :depends-on ("gtktypes" "gtkwidget" "gtkcontainer" "gtk" "gtktree" "gtktext" "gtkaction" "gtkselection" "gtkutils" "gtkstyle"))))