From 56a1f31a54ac8a540c32d9a0dca0b3764cc09666 Mon Sep 17 00:00:00 2001 Message-Id: <56a1f31a54ac8a540c32d9a0dca0b3764cc09666.1715485978.git.mdw@distorted.org.uk> From: Mark Wooding Date: Mon, 14 Feb 2005 00:40:38 +0000 Subject: [PATCH] Added gerror.lisp Organization: Straylight/Edgeware From: espen --- glib/export.lisp | 3 ++- glib/glib.asd | 19 +++++++++++++------ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/glib/export.lisp b/glib/export.lisp index 326d26a..478936b 100644 --- a/glib/export.lisp +++ b/glib/export.lisp @@ -15,7 +15,7 @@ ;; License along with this library; if not, write to the Free Software ;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -;; $Id: export.lisp,v 1.3 2005-02-10 20:24:25 espen Exp $ +;; $Id: export.lisp,v 1.4 2005-02-14 00:40:38 espen Exp $ ;;; Autogenerating exported symbols @@ -55,3 +55,4 @@ (export-from-file #p"clg:glib;gcallback.lisp") (export-from-file #p"clg:glib;ginterface.lisp") (export-from-file #p"clg:glib;gobject.lisp") (export-from-file #p"clg:glib;genums.lisp") +(export-from-file #p"clg:glib;gerror.lisp") diff --git a/glib/glib.asd b/glib/glib.asd index 814930c..99910c9 100644 --- a/glib/glib.asd +++ b/glib/glib.asd @@ -20,15 +20,21 @@ (pkg-exists-p "glib-2.0" :atleast-version "2.4.0") -(defvar *cmucl-include-path* "/usr/lib/cmucl/include") - +(when (string>= (pkg-version "glib-2.0") "2.6.0") + (push :glib2.6 *features*)) (defsystem glib :depends-on (clg-tools) :components ((:file "defpackage") - #+cmu(:file "pcl") + #+(and cmu (not clg-pcl))(:file "pcl") + ;; For preloading to work in glib 2.6, the library needs to + ;; be configured and build with '--disable-visibility' + (:unix-dso "preload" + :components ((:c-source-file "logging" + :cflags #.(pkg-cflags "glib-2.0")))) (:library "libglib-2.0" - :libdir #.(pkg-variable "glib-2.0" "libdir")) + :libdir #.(pkg-variable "glib-2.0" "libdir") + :depends-on ("preload")) (:library "libgobject-2.0" :libdir #.(pkg-variable "glib-2.0" "libdir") :depends-on ("libglib-2.0")) @@ -41,7 +47,7 @@ (:file "utils" :depends-on ("defpackage")) (:file "ffi" :depends-on ("utils")) (:file "glib" :depends-on ("ffi" "libglib-2.0")) - (:file "proxy" :depends-on (#+cmu"pcl" "glib")) + (:file "proxy" :depends-on (#+(and cmu (not clg-pcl))"pcl" "glib")) (:file "gtype" :depends-on ("proxy" "alien" "libgobject-2.0")) (:file "gboxed" :depends-on ("gtype")) (:file "genums" :depends-on ("gtype")) @@ -49,4 +55,5 @@ (: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 "gerror" :depends-on ("gcallback")) + (:file "export" :depends-on ("utils" "glib" "proxy" "gboxed" "gtype" "gparam" "gcallback" "genums" "gobject" "gerror")))) -- [mdw]