Update of /project/cello/cvsroot/cello/kt-opengl In directory clnet:/tmp/cvs-serv20733 Modified Files: kt-opengl.lisp Log Message: Changed: Use CFFI scheme to define and use foreign libs. --- /project/cello/cvsroot/cello/kt-opengl/kt-opengl.lisp 2006/08/25 08:39:26 1.4 +++ /project/cello/cvsroot/cello/kt-opengl/kt-opengl.lisp 2006/08/28 18:38:03 1.5 @@ -21,7 +21,7 @@ ;;; FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS ;;; IN THE SOFTWARE. -;;; $Id: kt-opengl.lisp,v 1.4 2006/08/25 08:39:26 fgoenninger Exp $ +;;; $Id: kt-opengl.lisp,v 1.5 2006/08/28 18:38:03 fgoenninger Exp $ (pushnew :kt-opengl *features*) @@ -80,21 +80,22 @@ (defvar *selecting*) -(defparameter *gl-dynamic-lib* - (make-pathname - ;;#+lispworks :host #-lispworks :device "c" - :directory '(:absolute "windows" "system32") - :name "opengl32" - :type "dll")) - -(defparameter *glu-dynamic-lib* - (make-pathname - ;;#+lispworks :host #-lispworks :device "c" - :directory '(:absolute "windows" "system32") - :name "glu32" - :type "dll")) - -(defparameter *glut-dynamic-lib* :unconfigured) +(define-foreign-library OpenGL + (:windows (:or (namestring + (make-pathname + ;;#+lispworks :host #-lispworks :device "c" + :directory '(:absolute "windows" "system32") + :name "opengl32" + :type "dll")))) + (:darwin (:or (:framework "OpenGL")))) + +(define-foreign-library GLU + (:windows (:or (namestring + (make-pathname + ;;#+lispworks :host #-lispworks :device "c" + :directory '(:absolute "windows" "system32") + :name "opengl32" + :type "dll"))))) (defparameter *opengl-dll* nil)