[cello-cvs] CVS update: cl-ftgl/cl-ftgl-config.lisp cl-ftgl/cl-ftgl.lisp

[Kenny Tilton]

Update of /project/cello/cvsroot/cl-ftgl
In directory common-lisp.net:/tmp/cvs-serv25239

Modified Files:
	cl-ftgl-config.lisp cl-ftgl.lisp 
Log Message:
OSX merge
Date: Wed Jun 15 23:07:28 2005
Author: ktilton

Index: cl-ftgl/cl-ftgl-config.lisp
diff -u cl-ftgl/cl-ftgl-config.lisp:1.1 cl-ftgl/cl-ftgl-config.lisp:1.2
--- cl-ftgl/cl-ftgl-config.lisp:1.1	Tue May 31 16:28:59 2005
+++ cl-ftgl/cl-ftgl-config.lisp	Wed Jun 15 23:07:28 2005
@@ -23,7 +23,7 @@
 (in-package :cl-ftgl)
 
 (defparameter *ftgl-dynamic-lib-path*
-  (make-pathname :directory '(:absolute "cell-cultures" "cell-cultures-user" "dynlib")
+  (make-pathname :directory '(:absolute "0dev" "user" "dynlib")
     :name "ftgl_dynamic_MTD_d"
     :type "dll"))
 


Index: cl-ftgl/cl-ftgl.lisp
diff -u cl-ftgl/cl-ftgl.lisp:1.1 cl-ftgl/cl-ftgl.lisp:1.2
--- cl-ftgl/cl-ftgl.lisp:1.1	Tue May 31 16:28:59 2005
+++ cl-ftgl/cl-ftgl.lisp	Wed Jun 15 23:07:28 2005
@@ -20,7 +20,7 @@
 ;;; FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS 
 ;;; IN THE SOFTWARE.
 
-;;; $Header: /project/cello/cvsroot/cl-ftgl/cl-ftgl.lisp,v 1.1 2005/05/31 14:28:59 ktilton Exp $
+;;; $Header: /project/cello/cvsroot/cl-ftgl/cl-ftgl.lisp,v 1.2 2005/06/15 21:07:28 ktilton Exp $
 
 (defpackage #:cl-ftgl
   (:nicknames #:ftgl)
@@ -167,13 +167,13 @@
   (values *cl-ftgl-freetype-dll-filename*))
 
 #+test
-(cl-ftgl-test)
+(cl-ftgl-test 'cl-ftgl-test-disp-fc)
 
 (defvar *start*)
 (defvar *frames*)
 (defun now () (/ (get-internal-real-time) internal-time-units-per-second))
 
-(defun cl-ftgl-test ()
+(defun cl-ftgl-test (&optional (disp-fn 'cl-ftgl-test-disp-fc))
   (setf *start* (now)
     *frames* 0)
   (cl-ftgl-reset)
@@ -181,7 +181,7 @@
     (mapcar (lambda (mode)
        (cons mode (ftgl-make mode *gui-style-default-face* 48 96 18)))
      '(:texture :pixmap :bitmap :outline :polygon :extruded)))
-  (ogl::lesson-14 'cl-ftgl-test-disp-fc))
+  (ogl::lesson-14 disp-fn))
 
 (defun test-font (mode)
   (cdr (assoc mode *test-fonts*)))
@@ -363,7 +363,7 @@
       () "CL-FTGL::CL-FTGL-INIT *** FTGL FREETYPE SHLIB COULD NOT BE LOADED FROM ~a !"
       *cl-ftgl-freetype-dll-full-filename*))
   
-  (ukt::Trc "!!!! Loading FTGL")
+  (print "!!!! Loading FTGL")
   (setq *ftgl-dll* (uffi:load-foreign-library *cl-ftgl-dll-full-filename*
                      :force-load #+lispworks t 
                      #-lispworks nil