[mcclim-cvs] CVS mcclim

[rschlatte]

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

Modified Files:
	mcclim.asd 
Log Message:
    Try to make beagle backend run both on 64-bit and 32-bit clozure cl
      * Only tested on 64-bit clozure cl 1.2rc1
      * hacked until clim-listener runs; chances are I missed many 'short-floats
      * Also don't (re)define symbols in the ccl package


--- /project/mcclim/cvsroot/mcclim/mcclim.asd	2008/05/01 21:45:23	1.83
+++ /project/mcclim/cvsroot/mcclim/mcclim.asd	2008/05/16 14:05:07	1.84
@@ -82,11 +82,9 @@
   (defsystem :clx
     :class requireable-system))
 
-;;; Required for the beagle backend (not activated by default)
+;;; Clozure CL native GUI stuff
 #+clim-beagle
-(progn
-  (require :cocoa)
-  (require :objc-support))
+(require :cocoa)
 
 (defmacro clim-defsystem ((module &key depends-on) &rest components)
   `(progn
@@ -405,6 +403,7 @@
               :serial t
               :components
               ((:file "package")
+               (:file "cocoa-util")
                (:module "native"
                 :components ((:file "lisp-bezier-path")
                              (:file "lisp-window")
@@ -417,7 +416,6 @@
                              (:file "lisp-slider")
                              (:file "lisp-button")
                              (:file "lisp-image")))
-               (:file "cocoa-util")
                (:module "windowing"
                 :depends-on ("native")
                 :components ((:file "port")