X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/0d07716fe78436ae6c9c324cabdd401c25e336af..aebc385c0ae134fc05e4e9d21741eacb70ca65f9:/clg.system

diff --git a/clg.system b/clg.system
index 53d5df3..9e4e520 100644
--- a/clg.system
+++ b/clg.system
@@ -20,28 +20,38 @@
      (:module glib
       :initially-do
       (progn
-	(load-shared-library "libglib-1.3.so.1")
-	(load-shared-library "libgobject-1.3.so.1" :init "g_type_init"))
+	(load-shared-library "libglib-1.3.so.2")
+	(load-shared-library "libgobject-1.3.so.2" :init "g_type_init"))
       :components
-      ((:file "glib-package")
+      ((:file "callback"
+	:language :c
+	:compiler-options
+	(:cflags ,(configure-cflags "glib-config-2.0")
+		 :optimize 2
+		 :definitions (#+cmu CMUCL)
+		 :include-paths ("/usr/src/cmucl-2.4.20/src/lisp")))
+       (:file "glib-package")
        (:file "gutils" :depends-on ("glib-package"))
        (:file "gforeign" :depends-on ("gutils"))
        (:file "glib" :depends-on ("gforeign"))
        (:file "gtype" :depends-on ("glib"))
+       (:file "gparam" :depends-on ("glib"))
+       (:file "gcallback" :depends-on ("gtype" "gparam" "callback"))
        (:file "gobject" :depends-on ("gtype"))
-       (:file "glib-export" :depends-on ("gutils" "glib" "gtype" "gobject")))
+       (:file "glib-export"
+	:depends-on ("gutils" "glib" "gtype" "gparam" "gcallback" "gobject")))
       :depends-on (tools))
      (:file "gdkglue"
       :source-pathname "gdk;"
       :binary-pathname "gdk;"
       :initially-do
       (progn
-	(load-shared-library "libgdk_pixbuf-1.3.so.1")
-	(load-shared-library "libgdk-x11-1.3.so.1")
+	(load-shared-library "libgdk_pixbuf-1.3.so.2")
+	(load-shared-library "libgdk-x11-1.3.so.2")
 	;; Initializing of gdk types is done by gtk, so we
 	;; have to load an initialize it at this point
 	(load-shared-library
-	 "libgtk-x11-1.3.so.1"
+	 "libgtk-x11-1.3.so.2"
 	 :init "gtk_init"
 	 :prototype '(function
 		      c-call:void
@@ -50,7 +60,7 @@
 	 :initargs (list (system:int-sap 0) (system:int-sap 0))))
       :language :c
       :compiler-options (:cflags ,(configure-cflags "gtk-config-2.0")
-			 :optimize 2))
+				 :optimize 2))
      (:module gdk
       :components
       ((:file "gdk-package")
@@ -73,9 +83,13 @@
        (:file "gtk-export" :depends-on ("gtkenums" "gtktypes" "gtk"))
        (:file "gtkobject" :depends-on ("gtk-package"))
        (:file "gtkenums" :depends-on ("gtk-package"))
-       (:file "gtktypes" :depends-on ("gtkenums" "gtkobject"))
-       (:file "gtkwidget" :depends-on ("gtktypes"))
-       (:file "gtkcontainer" :depends-on ("gtktypes"))
-       (:file "gtk" :depends-on ("gtkcontainer")))
+        (:file "gtktypes" :depends-on ("gtkenums" "gtkobject"))
+        (:file "gtkwidget" :depends-on ("gtktypes"))
+        (:file "gtkcontainer" :depends-on ("gtktypes"))
+        (:file "gtk" :depends-on ("gtktypes"))
+        (:file "gtkutils" :depends-on ("gtk"))
+       )
       :depends-on (glib gdk "gtkglue")))))
 
+
+