From 269a2752db83a9e768087634365da2326674d447 Mon Sep 17 00:00:00 2001 From: Eli Barzilay Date: Thu, 4 Sep 2008 22:55:52 +0000 Subject: [PATCH] use stdcall for windows svn: r11546 --- collects/sgl/gl.ss | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/collects/sgl/gl.ss b/collects/sgl/gl.ss index 87d01cca19..88db862214 100644 --- a/collects/sgl/gl.ss +++ b/collects/sgl/gl.ss @@ -4,11 +4,14 @@ "gl-vectors.ss") (unsafe!) -(define gl-lib (case (system-type) + +(define stype (system-type)) + +(define gl-lib (case stype [(windows) (ffi-lib "opengl32")] [(macosx) (ffi-lib "/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL")] [else (ffi-lib "libGL")])) -(define glu-lib (case (system-type) +(define glu-lib (case stype [(windows) (ffi-lib "glu32")] [(macosx) (ffi-lib "/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGLU")] [else (ffi-lib "libGLU")])) @@ -16,6 +19,11 @@ (define (unavailable name) (lambda () (lambda x (error name "unavailable on this system")))) +(define-syntax _fun* + (syntax-rules () + [(_fun x ...) + (if (eq? 'windows stype) (_fun #:abi 'stdcall x ...) (_fun x ...))])) + (define-syntax define-foreign-lib (syntax-rules (->) [(_ lib name type ... ->)