Update of /project/cello/cvsroot/cello/cl-ftgl In directory clnet:/tmp/cvs-serv2070/cl-ftgl

Modified Files: cl-ftgl.lisp cl-ftgl.lpr Log Message:

--- /project/cello/cvsroot/cello/cl-ftgl/cl-ftgl.lisp 2006/10/13 05:57:27 1.16 +++ /project/cello/cvsroot/cello/cl-ftgl/cl-ftgl.lisp 2007/02/02 20:11:02 1.17 @@ -1,6 +1,6 @@ ;; -*- mode: Lisp; Syntax: Common-Lisp; Package: cl-ftgl; -*- ;;; -;;; Copyright © 2004 by Kenneth William Tilton. +;;; Copyright (c) 2004 by Kenneth William Tilton. ;;;;; ;;; Permission is hereby granted, free of charge, to any person obtaining a copy ;;; of this software and associated documentation files (the "Software"), to deal @@ -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/cello/cl-ftgl/cl-ftgl.lisp,v 1.16 2006/10/13 05:57:27 ktilton Exp $ +;;; $Header: /project/cello/cvsroot/cello/cl-ftgl/cl-ftgl.lisp,v 1.17 2007/02/02 20:11:02 ktilton Exp $

(eval-when (:compile-toplevel :load-toplevel) (pushnew :cl-ftgl *features*)) @@ -54,34 +54,35 @@

(in-package :cl-ftgl)

+;;; NOTE: Must build the ftgl-int/FTGLFromC.cpp glue library. (define-foreign-library FTGL - (:darwin (:or "/opt/common-lisp/cello/cl-ftgl/ftgl-int/libFTGLint.dylib")) + (:darwin "libfgc.dylib") (:windows (:or "/0dev/user/dynlib/ftgl_dynamic_MTD_d.dll")))

;;(use-foreign-library FTGL) - frgo: This leads to problems on OS X !!! ;; -> Use function cl-ftgl-init !

-(defparameter *gui-style-default-face* 'sylfaen) -(defparameter *gui-style-button-face* 'sylfaen) +(defparameter *gui-style-default-face* + #-cffi-features:darwin 'sylfaen + #+cffi-features:darwin "Helvetica") + +(defparameter *gui-style-button-face* + #-cffi-features:darwin 'sylfaen + #+cffi-features:darwin "Helvetica") + (defparameter *ftgl-loaded-p* nil) (defparameter *ftgl-fonts-loaded* nil) (defparameter *ftgl-ogl* nil)

(defparameter *ftgl-font-pathnames-list*

- #+(or win32 windows mswindows) + #+cffi-features:windows (list (make-pathname :directory '(:absolute "Windows" "fonts")))

- #+linux - (list - (make-pathname - :directory - '(:absolute "usr" "share" "truetype"))) - - #+macosx + #+cffi-features:darwin (list (make-pathname :directory @@ -92,18 +93,21 @@ (make-pathname :directory '(:relative "~" "Library" "Fonts"))) + + #+(and cffi-features:unix (not cffi-features:darwin)) + (list + (make-pathname + :directory + '(:absolute "usr" "share" "truetype"))) )

(defparameter *ftgl-font-types-list* ;; list of font types ;; (font filename endings) - #+(or win32 windows mswindows) - '("ttf") - - #+linux - '("ttf") - - #+macosx + #+cffi-features:darwin '("dfont" "ttf") + + #+(or cffi-features:windows (and cffi-features:unix (not cffi-features:darwin))) + '("ttf") )

--- /project/cello/cvsroot/cello/cl-ftgl/cl-ftgl.lpr 2006/11/13 05:29:28 1.10 +++ /project/cello/cvsroot/cello/cl-ftgl/cl-ftgl.lpr 2007/02/02 20:11:03 1.11 @@ -1,4 +1,4 @@ -;; -*- lisp-version: "8.0 [Windows] (Nov 6, 2006 16:43)"; cg: "1.81"; -*- +;; -*- lisp-version: "8.0 [Windows] (Jan 22, 2007 8:01)"; cg: "1.81"; -*-

(in-package :cg-user)