Ticket #88: cairo.diff

test-cairo.scm

@@ -2 +2 @@
 ; Michael Bridgen <mikeb@squaremobius.net>
 ; Tony Garnock-Jones <tonyg@kcbbs.gen.nz>
 
-(require 'posix)
-(require 'sdl)
-(require 'cairo)
+(use posix)
+(use sdl)
+(use cairo)
+(import chicken scheme foreign)
 
+(declare
+ (foreign-declare "#include <SDL.h>\n")
+ (run-time-macros)
+)
+(foreign-code "SDL_Init(SDL_INIT_EVERYTHING);")
+
+
+
 (sdl-init SDL_INIT_EVERYTHING)
 
 (define maxx 640)

cairo.setup

@@ -1 @@
-(run (make extension))
-(install-extension 'cairo '("cairo.so"))
+(let ((pkg-cflags (with-input-from-pipe "pkg-config --cflags cairo" read-line))
+      (pkg-lflags (with-input-from-pipe "pkg-config --libs cairo" read-line)))
+      (compile -s -O2 cairo.scm -j cairo -lcairo ,pkg-cflags ,pkg-lflags)
+      (compile -c -O2 cairo.scm -unit cairo ,pkg-cflags ,pkg-lflags)
+      (compile -s -O2 cairo.import.scm ,pkg-cflags ,pkg-lflags))
+
+(install-extension 'cairo '("cairo.so" "cairo.import.so" "cairo.o") '(version "v0.1.3-alpha"))
+

cairo.scm

@@ -20 +20 @@
 
 ; --------------------------------------------------
 
-(declare
- (usual-integrations)
+(module cairo
+ *
+ (import chicken scheme foreign)
 
+ (use srfi-1)
+ (use srfi-4)
+ (use srfi-13)
+ (use lolevel)
+
+ (import-for-syntax srfi-1)
+ (import-for-syntax srfi-13)
+
  (foreign-declare #<<EOF
 
 #include "cairo.h"
 
 EOF
-))
+)
 
-(require 'srfi-1)
-(require 'srfi-13)
-(require 'lolevel)
-
-(require-for-syntax 'srfi-1)
-(require-for-syntax 'srfi-13)
-
 ;; Define a list of DEFINEs or enums at once.
-(define-macro (--cairo-flags . strs)
-  `(begin
-     ,@(append-map (lambda (str)
-                     (let* ((sym (string->symbol str))
-                            (psym (string->symbol (string-append "-" (symbol->string sym)))))
-                       `((define-foreign-variable ,psym unsigned-integer ,str)
-                         (define ,sym ,psym))))
-                   strs)))
+(define-syntax --cairo-flags
+  (lambda (e r c)
+    (let ((strs (cdr e)))
+      `(begin
+         ,@(append-map (lambda (str)
+                         (let* ((sym (string->symbol str))
+                                (psym (string->symbol (string-append "-" (symbol->string sym)))))
+                           `((,(r 'define-foreign-variable) ,psym unsigned-integer ,str)
+                             (,(r 'define) ,sym ,psym))))
+                       strs)))))
 
 (define *cairo-egg-version* '(0 1 3 alpha))
 
@@ -299 +303 @@
 (define-record cairo-text-extents-type buffer)
 (let ((maker make-cairo-text-extents-type))
   (set! make-cairo-text-extents-type
-    (lambda () (maker (make-byte-vector sizeof-cairo-text-extents)))))
+    (lambda () (maker (make-u8vector sizeof-cairo-text-extents)))))
 
 (define-record-printer (cairo-text-extents-type te out)
   (for-each (lambda (x) (display x out)
@@ -337 +341 @@
 (define-record cairo-font-extents-type buffer)
 (let ((maker make-cairo-font-extents-type))
   (set! make-cairo-font-extents-type
-    (lambda () (maker (make-byte-vector sizeof-cairo-font-extents)))))
+    (lambda () (maker (make-u8vector sizeof-cairo-font-extents)))))
 
 (define-record-printer (cairo-font-extents-type e out)
   (for-each (lambda (x) (display x out)
@@ -595 +599 @@
                                             "cairo_surface_flush"
                                             cairo_surface_t
                                             ))
+)