Update of /project/cells/cvsroot/cell-cultures In directory common-lisp.net:/tmp/cvs-serv27567

Modified Files: build-sys-kt.lisp build.lisp cello-config.lisp Log Message: Re-port to Lispworks/win32 Date: Thu Oct 28 02:08:54 2004 Author: ktilton

Index: cell-cultures/build-sys-kt.lisp diff -u cell-cultures/build-sys-kt.lisp:1.1 cell-cultures/build-sys-kt.lisp:1.2 --- cell-cultures/build-sys-kt.lisp:1.1 Sat Jun 26 20:38:32 2004 +++ cell-cultures/build-sys-kt.lisp Thu Oct 28 02:08:54 2004 @@ -9,7 +9,7 @@ (source-directory (merge-pathnames (make-pathname :directory `(:relative ,@path)) - *devel-root*))) + cl-user::*cell-cultures-directory*))) (let ( #+cmu18 (ext:*derive-function-types* nil)

Index: cell-cultures/build.lisp diff -u cell-cultures/build.lisp:1.2 cell-cultures/build.lisp:1.3 --- cell-cultures/build.lisp:1.2 Sun Jul 4 20:59:39 2004 +++ cell-cultures/build.lisp Thu Oct 28 02:08:54 2004 @@ -8,62 +8,55 @@ ;; and in configure.lisp ;; ----------------------------------------------

-;;; ---- Iff you do not have ASDF loaded.... -;;; -#-(or asdf allegro-ide) -(load (merge-pathnames - (make-pathname - :name "asdf" - :type "lisp") - *devel-root*)) - ;;; ---- -#-allegro-ide + +#+forconvenience +(load (make-pathname + :directory '(:absolute "cell-cultures" "cell-cultures-user" "config") + :name "cell-cultures-config" + :type "lisp")) + (load (merge-pathnames (make-pathname :name "build-sys-kt" :type "lisp") - *devel-root*)) + cl-user::*cell-cultures-directory*))

-;;; --- teach ASDF about LPR files -(let ((d-force t)) - (build-sys d-force "asdf-aclproj")) - -#-allegro-ide -(let ((d-force t)) - (pushnew :cells-testing *features*) - (build-sys d-force "cells") - (build-sys d-force "cells" "cells-test")) +(let ((force nil)) + (build-sys force "utils-kt"))

-#-allegro-ide -(let ((d-force nil)) - (build-sys d-force "uffi") ;;; <---- lose this if you already have UFFI - (build-sys d-force "cello" "ffi-extender") - (build-sys d-force "cello" "cl-opengl")) +(progn ;;; let ((force nil)) + ;; (pushnew :cells-testing *features*) + (build-sys t "cells") + ;; (build-sys t "cells" "cells-test") + ) + +(let ((force nil)) + (build-sys force "ffi-extender") + (build-sys force "cl-opengl") + )

#+test (ogl::lesson-14)

-#-allegro-ide (let ((ftgl (merge-pathnames (make-pathname :directory '(:relative "cl-ftgl") :name "cl-ftgl") - *cello-directory*))) + *cell-cultures-directory* ))) (compile-file ftgl) (load ftgl))

#+test (cl-ftgl::cl-ftgl-test)

-#-allegro-ide (let ((d-force nil)) - (build-sys d-force "cello" "cells") - (build-sys d-force "cello" "cellocore") - (build-sys d-force "cello" "cl-openal") - (build-sys d-force "cello" "cl-magick") + (build-sys d-force "cl-openal") + (build-sys d-force "cl-magick") (build-sys d-force "cello") - (build-sys d-force "cello" "cellodemo")) + (build-sys d-force "cellodemo"))

#+tests (cello::cello-test) + +

Index: cell-cultures/cello-config.lisp diff -u cell-cultures/cello-config.lisp:1.2 cell-cultures/cello-config.lisp:1.3 --- cell-cultures/cello-config.lisp:1.2 Sun Jul 4 20:59:39 2004 +++ cell-cultures/cello-config.lisp Thu Oct 28 02:08:54 2004 @@ -1,20 +1 @@ -(in-package :cl-user) - -(defparameter *cello-directory* - (merge-pathnames - (make-pathname :directory `(:relative "cello")) - *devel-root*) - "The top of the Cello source tree") - -(defparameter *cello-config-directory* ;; contains sundry *-config.lisp files - (merge-pathnames - (make-pathname - :directory `(:relative "config")) - *devel-root*)) - -(defparameter *cello-dynlib-directory* - (merge-pathnames - (make-pathname - :directory `(:relative "dynlib")) - *devel-root*)) - +;; delete me \ No newline at end of file