X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/85482331660eb6044d70881636b8d0b444e47f41..936b4446bbe65b58bd5ac2b0023fae18c7bf4d74:/clg.system diff --git a/clg.system b/clg.system index 22e463c..eeafe11 100644 --- a/clg.system +++ b/clg.system @@ -1,36 +1,61 @@ ;;; -*- Mode: lisp -*- -(setf - (logical-pathname-translations "clg") - '(("**;*.*.*" "/home/espen/src/clg/**/*.*.*"))) -(setq mk::*cmu-errors-to-file* nil) -(setq ext:*environment-list* (cons '(:PKG_CONFIG_PATH . "/opt/gnome/lib/pkgconfig") ext:*environment-list*)) +(defpackage "CLG-SYSTEM" + (:use "COMMON-LISP" "EXTENSIONS" "ALIEN") + (:export "*GTK-LIBRARY-PATH*")) + +(in-package "CLG-SYSTEM") + +;; We used to do this, but I think it's better if everybody puts such +;; definitions in his/her own Lisp startup files so that clg.system +;; can be used without local modifications. +;(setf +; (logical-pathname-translations "clg") +; '(("**;*.*.*" "/home/espen/src/clg/**/*.*.*"))) + +;; Uncomment and edit the next line if pkg-config needs to search for +;; .pc files in directories other than the default (/usr/lib/pkgconfig) +;(push '(:PKG_CONFIG_PATH . "/opt/gnome/lib/pkgconfig") ext:*environment-list*) (load "clg:tools;config") (load "clg:tools;sharedlib") -(import 'alien:load-shared-library) +(defvar *gtk-library-path* (pkg-variable "gtk+-2.0" "libdir")) +(defvar *cmucl-include-path* (ext:unix-namestring "target:lisp")) + +;; Without this, MAKE uses "CLG:glib;.err" as a namestring, which fails. +;; TODO: Find and fix the bug, then remove this. +(setq mk::*cmu-errors-to-file* nil) (eval `(mk:defsystem clg + :initially-do + (progn + (pkg-exists-p "glib-2.0" :atleast-version "1.3.12") + (pkg-exists-p "pango" :atleast-version "0.23") + (pkg-exists-p "atk" :atleast-version "0.8") + (pkg-exists-p "gtk+-2.0" :atleast-version "1.3.12")) :source-pathname "clg:" :binary-pathname "clg:" :components ((:module tools :components ("autoexport")) + (:file "pcl" :source-pathname "glib;" :binary-pathname "glib;") (:module glib :initially-do (progn - (load-shared-library "libglib-1.3.so.4") - (load-shared-library "libgobject-1.3.so.4" :init "g_type_init")) + (load-shared-library "libglib-1.3.so") + (load-shared-library "libgobject-1.3.so" :init "g_type_init")) :components ((:file "callback" :language :c + :source-extension "c" + :binary-extension "o" :compiler-options (:cflags ,(pkg-cflags "glib-2.0") :optimize 2 :definitions (#+cmu CMUCL) - :include-paths ("/usr/src/cmucl-2.4.20/src/lisp"))) + :include-paths (,*cmucl-include-path*))) (:file "glib-package") (:file "gutils" :depends-on ("glib-package")) (:file "gforeign" :depends-on ("gutils")) @@ -38,29 +63,32 @@ (:file "proxy" :depends-on ("glib")) (:file "gtype" :depends-on ("proxy")) (:file "gboxed" :depends-on ("gtype")) - (:file "gcallback" :depends-on ("gtype" "gparam" "callback")) (: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" "callback")) (:file "glib-export" :depends-on ("gutils" "glib" "proxy" "gboxed" "gtype" "gparam" "gcallback" "genums" "gobject"))) - :depends-on (tools)) + :depends-on (tools "pcl")) (:file "gdkglue" :source-pathname "gdk;" :binary-pathname "gdk;" :initially-do (progn - (load-shared-library "libgdk_pixbuf-1.3.so.4") - (load-shared-library "libgdk-x11-1.3.so.4" + (load-shared-library "libgdk_pixbuf-1.3.so") + (load-shared-library "libgdk-x11-1.3.so" :init "gdk_init" :prototype '(function c-call:void - alien:system-area-pointer - alien:system-area-pointer) + system-area-pointer + system-area-pointer) :initargs (list (system:int-sap 0) (system:int-sap 0)))) :language :c + :source-extension "c" + :binary-extension "o" :compiler-options (:cflags ,(pkg-cflags "gtk+-2.0") :optimize 2)) (:module gdk @@ -71,37 +99,48 @@ (:file "gdkevents" :depends-on ("gdktypes")) (:file "gdk" :depends-on ("gdkevents"))) :depends-on (glib "gdkglue")) + (:module pango + :initially-do (load-shared-library "libpango.so") + :components + ((:file "pango-package") + (:file "pango" :depends-on ("pango-package")) + (:file "pango-export" :depends-on ("pango"))) + :depends-on (glib)) + (:module atk + :initially-do (load-shared-library "libatk.so") + :components + ((:file "atk-package") + (:file "atk" :depends-on ("atk-package")) + (:file "atk-export" :depends-on ("atk"))) + :depends-on (glib)) (:file "gtkglue" :source-pathname "gtk;" :binary-pathname "gtk;" :initially-do (progn (load-shared-library - "libgtk-x11-1.3.so.4" + "libgtk-x11-1.3.so" :init "gtk_init" :prototype '(function c-call:void - alien:system-area-pointer - alien:system-area-pointer) + system-area-pointer + system-area-pointer) :initargs (list (system:int-sap 0) (system:int-sap 0)))) :language :c + :source-extension "c" + :binary-extension "o" :compiler-options (:cflags ,(pkg-cflags "gtk+-2.0") :optimize 2 :definitions (#+cmu CMUCL) - :include-paths ("/usr/lib/cmucl"))) + :include-paths (,*cmucl-include-path*))) (:module gtk :components ((:file "gtk-package") -; (:file "gtk-export" :depends-on ("gtkenums" "gtktypes" "gtk")) -; (:file "gtkobject" :depends-on ("gtk-package")) -; (: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")) -))) - - - + (:file "gtk-export" :depends-on ("gtktypes" "gtk")) + (:file "gtkobject" :depends-on ("gtk-package")) + (:file "gtktypes" :depends-on ("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 pango atk "gtkglue")))))