X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/f11b84f65d5cd48eb93fe7738d43c264ac73ca5f..ca0703e8a35fb4b342d2b00d749525345affc581:/glib/glib.asd

diff --git a/glib/glib.asd b/glib/glib.asd
index 58be07e..b4b9582 100644
--- a/glib/glib.asd
+++ b/glib/glib.asd
@@ -1,51 +1,44 @@
 ;;; -*- Mode: lisp -*-
 
 (asdf:oos 'asdf:load-op :clg-tools)
+(asdf:oos 'asdf:load-op :gffi)
 
 (defpackage "GLIB-SYSTEM"
-  (:use "COMMON-LISP" "ASDF" "PKG-CONFIG" "SHAREDLIB")
-  (:export "*GTK-LIBRARY-PATH*"))
-
-
-;;; Better put this in ~/.cmucl-init.lisp or some other file read at startup
-;; (setf
-;;  (logical-pathname-translations "clg")
-;;  '(("**;*.*.*" "/home/espen/src/clg/**/")))
-
-(ext:unlock-all-packages)
+  (:use "COMMON-LISP" "ASDF" "PKG-CONFIG"))
 
 (in-package "GLIB-SYSTEM")
 
-(pkg-exists-p "glib-2.0" :atleast-version "2.4.0")
-
-(defvar *cmucl-include-path* "/usr/lib/cmucl/include")
-(defvar *gtk-library-path* (pkg-variable "gtk+-2.0" "libdir"))
-
-
-(load-shared-library "libglib-2.0")
-(load-shared-library "libgobject-2.0" :init "g_type_init")
-
+(pkg-exists-p "glib-2.0" :atleast-version "2.4.0" :error t)
 
 (defsystem glib
-    :depends-on (clg-tools)
+    :depends-on (clg-tools gffi)
     :components ((:file "defpackage")
-		 (:file "pcl")
-		 (:unix-dso "alien"
-		  :components ((:c-source-file "callback"
-				:definitions ("CMUCL")
-				:include-paths (#.*cmucl-include-path*)
-				:cflags #.(pkg-cflags "glib-2.0"))
-			       (:c-source-file "gobject" 
-				:cflags #.(pkg-cflags "glib-2.0"))))
-		 (:file "utils" :depends-on ("defpackage"))
-		 (:file "ffi" :depends-on ("utils" "alien"))
-		 (:file "glib" :depends-on ("ffi"))
-		 (:file "proxy" :depends-on ("pcl" "glib"))
-		 (:file "gtype" :depends-on ("proxy"))
+		 ;; For preloading to work in glib 2.6, the library needs to 
+		 ;; be configured and build with '--disable-visibility'
+  		 (:shared-object "glib-preload" :pathname "preload/"
+  		  :components ((:c-source-file "logging"
+  				:cflags #.(pkg-cflags "glib-2.0"))))
+		 (:library "libglib-2.0"
+		  :libdir #.(pkg-libdir "glib-2.0")
+		  :libname #-win32 "libglib-2.0"
+		           #+win32 "libglib-2.0-0"
+		  :depends-on ("glib-preload"))
+		 (:library "libgobject-2.0"
+		  :libdir #.(pkg-libdir "gobject-2.0")
+		  :libname #-win32 "libgobject-2.0"
+		           #+win32 "libgobject-2.0-0"
+		  :depends-on ("libglib-2.0"))
+		 (:shared-object "glib-alien" :pathname "alien/"
+		  :components ((:c-source-file "gobject" 
+				:cflags #.(pkg-cflags "glib-2.0")))
+		  :depends-on ("libgobject-2.0"))
+		 (:file "glib" :depends-on ("libglib-2.0" "defpackage"))
+		 (:file "gtype" :depends-on ("glib-alien" "libgobject-2.0" "glib"))
 		 (:file "gboxed" :depends-on ("gtype"))
 		 (:file "genums" :depends-on ("gtype"))
 		 (:file "gparam" :depends-on ("genums"))
-		 (:file "ginterface" :depends-on ("gtype"))
 		 (:file "gobject" :depends-on ("gparam"))
-		 (:file "gcallback" :depends-on ("gtype" "gparam" "gobject" "alien"))
-		 (:file "export" :depends-on ("utils" "glib" "proxy" "gboxed" "gtype" "gparam" "gcallback" "genums" "gobject"))))
+		 (:file "ginterface" :depends-on ("gobject"))
+		 (:file "gcallback" :depends-on ("gtype" "gparam" "gobject"))
+		 (:file "gerror" :depends-on ("gcallback"))
+		 (:file "main-loop" :depends-on ("defpackage"))))