Update of /project/mcclim/cvsroot/mcclim In directory clnet:/tmp/cvs-serv5752

Modified Files: mcclim.asd Log Message:

Easier Gtkairo building on Windows:

If the :GTKAIRO feature is set, disable the dependency from CLIM-LOOKS to CLIM-CLX.

This way, the default is to load CLIM-CLX as usual, but users who explicitly request Gtkairo can build without CLX and sb-bsd-sockets.

--- /project/mcclim/cvsroot/mcclim/mcclim.asd 2006/11/05 18:22:07 1.31 +++ /project/mcclim/cvsroot/mcclim/mcclim.asd 2006/11/05 19:00:54 1.32 @@ -295,7 +295,8 @@ :depends-on (:clim :clim-postscript ;; If we're on an implementation that ships CLX, use ;; it. Same if the user has loaded CLX already. - #+(or sbcl scl openmcl ecl clx allegro) :clim-clx + #+(and (or sbcl scl openmcl ecl clx allegro) (not gtkairo)) + :clim-clx #+gl :clim-opengl ;; OpenMCL and MCL support the beagle backend (native ;; OS X look&feel on OS X). @@ -309,7 +310,8 @@ ;; null backend :clim-null ) - :components ((:file "Looks/pixie" + :components (#-gtkairo + (:file "Looks/pixie" :pathname #.(make-pathname :directory '(:relative "Looks") :name "pixie" :type "lisp"))))

;;; name of :clim-clx-user chosen by mikemac for no good reason