X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/a32597397889eb5d995ea476e16c2627c953cf58..db7a1e771d6aec41d0489b07c546d99ebbbc1019:/glib/glib.asd

diff --git a/glib/glib.asd b/glib/glib.asd
index bc1d30e..d083773 100644
--- a/glib/glib.asd
+++ b/glib/glib.asd
@@ -1,12 +1,10 @@
 ;;; -*- Mode: lisp -*-
 
 (asdf:oos 'asdf:load-op :clg-tools)
+(asdf:oos 'asdf:load-op :gffi)
 
 (defpackage "GLIB-SYSTEM"
-  (:use "COMMON-LISP" "ASDF" "PKG-CONFIG")
-  (:export "*GTK-LIBRARY-PATH*"))
-
-(ext:unlock-all-packages)
+  (:use "COMMON-LISP" "ASDF" "PKG-CONFIG"))
 
 ;;; Better put this in ~/.cmucl-init.lisp or some other file read at startup
 ;; (setf
@@ -15,43 +13,36 @@
 
 (in-package "GLIB-SYSTEM")
 
-(pkg-exists-p "glib-2.0" :atleast-version "2.4.0")
-
-(defvar *cmucl-include-path* "/usr/lib/cmucl/include")
-
-;; TODO: remove this
-(defvar *gtk-library-path* (pkg-variable "gtk+-2.0" "libdir"))
-
+(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")
-		 ;; It is necessary to load this before libglib-2.0.so,
-		 ;; otherwise our implementation of g_logv won't be
-		 ;; used by the library
-		 (: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"))))
-		 (:library "libglib-2.0" 
-			    :libdir #.(pkg-variable "glib-2.0" "libdir")
-			    :depends-on ("alien"))
-		 (:library "libgobject-2.0" 
-			    :libdir #.(pkg-variable "glib-2.0" "libdir")
-			    :depends-on ("libglib-2.0"))
-		 (:file "utils" :depends-on ("defpackage"))
-		 (:file "ffi" :depends-on ("utils"))
-		 (:file "glib" :depends-on ("ffi" "libglib-2.0"))
-		 (:file "proxy" :depends-on ("pcl" "glib"))
-		 (:file "gtype" :depends-on ("proxy" "libgobject-2.0"))
+		 ;; 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 "gobject" :depends-on ("gparam"))
 		 (:file "ginterface" :depends-on ("gobject"))
-		 (:file "gcallback" :depends-on ("gtype" "gparam" "gobject" "alien"))
-		 (:file "export" :depends-on ("utils" "glib" "proxy" "gboxed" "gtype" "gparam" "gcallback" "genums" "gobject"))))
+		 (:file "gcallback" :depends-on ("gtype" "gparam" "gobject"))
+		 (:file "gerror" :depends-on ("gcallback"))))
\ No newline at end of file