moved the opengl libraries from lab/ to lib/ so that they get

installed as user libraries.

lib/Makefile.am

@@ -1,5 +1,7 @@
 libstreamsdir=$(pkglibdir)/streams
 dist_libstreams_DATA=streams/primitive.ss streams/derived.ss
 
-dist_pkglib_DATA=streams.ss match.ss pregexp.ss
+dist_pkglib_DATA= streams.ss match.ss pregexp.ss gl.ss glut.ss \
+                 ypsilon-compat.ikarus.ss ypsilon-compat.ypsilon.ss
+
 

lib/Makefile.in

@@ -160,7 +160,9 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 libstreamsdir = $(pkglibdir)/streams
 dist_libstreams_DATA = streams/primitive.ss streams/derived.ss
-dist_pkglib_DATA = streams.ss match.ss pregexp.ss
+dist_pkglib_DATA = streams.ss match.ss pregexp.ss gl.ss glut.ss \
+                 ypsilon-compat.ikarus.ss ypsilon-compat.ypsilon.ss
+
 all: all-am
 
 .SUFFIXES:

lib/ypsilon-compat.ikarus.ss

@@ -88,17 +88,21 @@
        (check-byte* who (string->utf8 x))]
       [else (die who "not a char*" x)]))
       
+  (define pointer-size
+    (cond
+      [(<= (fixnum-width) 32) 4]
+      [else                   8]))
 
   (define (check-char** who x)
     (cond
       [(and (vector? x) (vector-andmap string? x))
        (let ([n (vector-length x)])
-         (let ([p (malloc (* n 4))])
+         (let ([p (malloc (* n pointer-size))])
            (let f ([i 0])
              (cond
                [(= i n) p]
                [else
-                (pointer-set-int p (* i 4)
+                (pointer-set-int p (* i pointer-size)
                   (pointer->integer (check-char* who (vector-ref x i))))
                 (f (+ i 1))]))))]
       [else (die who "not a char**" x)]))
@@ -233,7 +237,7 @@
       (syntax-case x ()
         [(_ function-name argnum argtype argval)
          (begin
-           (printf "syntax ~s\n" (syntax->datum x))
+           ;(printf "syntax ~s\n" (syntax->datum x))
            #'(void))])))
 
 )

scheme/last-revision

@@ -1 +1 @@
-1607
+1610