Update of /project/cello/cvsroot/cello In directory clnet:/tmp/cvs-serv8567 Modified Files: cello.lisp cello.lpr window.lisp Log Message: Cello Rizing. cl-opengl becomes kt-opengl, hello-cffi becomes cffi-extender, end lots more to come --- /project/cello/cvsroot/cello/cello.lisp 2006/05/17 16:14:27 1.2 +++ /project/cello/cvsroot/cello/cello.lisp 2006/05/26 22:08:55 1.3 @@ -34,6 +34,7 @@ #:cl-openal #:cl-ftgl #:cl-magick - #:celtk)) + #:celtk) + (:shadowing-import-from #:celtk #:window)) (in-package :cello) --- /project/cello/cvsroot/cello/cello.lpr 2006/05/17 16:14:27 1.2 +++ /project/cello/cvsroot/cello/cello.lpr 2006/05/26 22:08:55 1.3 @@ -1,4 +1,4 @@ -;; -*- lisp-version: "8.0 [Windows] (May 5, 2006 15:39)"; cg: "1.81"; -*- +;; -*- lisp-version: "8.0 [Windows] (May 11, 2006 6:29)"; cg: "1.81"; -*- (in-package :cg-user) @@ -6,7 +6,6 @@ (define-project :name :cello :modules (list (make-instance 'module :name "cello.lisp") - (make-instance 'module :name "datetime.lisp") (make-instance 'module :name "window-macros.lisp") (make-instance 'module :name "clipping.lisp") (make-instance 'module :name "mg-geometry.lisp") @@ -48,22 +47,22 @@ (make-instance 'module :name "cello-magick.lisp") (make-instance 'module :name "cello-openal.lisp")) :projects (list (make-instance 'project-module :name - "c:\\0dev\\cells\\cells") - (make-instance 'project-module :name "..\\Celtk\\CELTK") (make-instance 'project-module :name - "c:\\0dev\\cl-opengl\\cl-opengl") + "hello-cffi\\hello-cffi") + (make-instance 'project-module :name + "cl-opengl\\cl-opengl") (make-instance 'project-module :name - "..\\cl-ftgl\\cl-ftgl") + "cl-magick\\cl-magick") (make-instance 'project-module :name - "c:\\0dev\\cl-magick\\cl-magick") + "cl-ftgl\\cl-ftgl") (make-instance 'project-module :name - "..\\cl-openal\\cl-openal")) + "cl-openal\\cl-openal")) :libraries nil :distributed-files nil :internally-loaded-files nil :project-package-name :cello - :main-form 'cello::form3 + :main-form nil :compilation-unit t :verbose nil :runtime-modules nil --- /project/cello/cvsroot/cello/window.lisp 2006/05/17 16:14:28 1.2 +++ /project/cello/cvsroot/cello/window.lisp 2006/05/26 22:08:55 1.3 @@ -26,7 +26,7 @@ ; -(defmodel window (celtk:window focuser ix-lit-scene control ogl-shared-resource-tender) +(defmodel cello-window (celtk:window focuser ix-lit-scene control ogl-shared-resource-tender) ( (redisplayp :cell nil :initarg :redisplayp :initform nil :accessor redisplayp) (self-sizing :cell nil :initarg :self-sizing :initform nil :accessor self-sizing)