diff options
| -rw-r--r-- | 2d/color.scm | 2 | ||||
| -rw-r--r-- | 2d/font.scm | 5 | ||||
| -rw-r--r-- | 2d/game.scm | 2 | ||||
| -rw-r--r-- | 2d/shader.scm | 4 | ||||
| -rw-r--r-- | 2d/sprite.scm | 4 | ||||
| -rw-r--r-- | 2d/texture.scm | 4 | ||||
| -rw-r--r-- | 2d/vector2.scm | 1 | ||||
| -rw-r--r-- | 2d/window.scm | 2 | ||||
| -rw-r--r-- | 2d/wrappers/gl.scm | 4 | ||||
| -rw-r--r-- | 2d/wrappers/util.scm | 2 | ||||
| -rw-r--r-- | INSTALL.org | 28 | ||||
| -rw-r--r-- | README.org | 2 |
12 files changed, 20 insertions, 40 deletions
diff --git a/2d/color.scm b/2d/color.scm index 959f1b6..f66c659 100644 --- a/2d/color.scm +++ b/2d/color.scm @@ -22,7 +22,7 @@ ;;; Code: (define-module (2d color) - #:use-module (figl gl) + #:use-module (gl) #:use-module (srfi srfi-9) #:use-module (srfi srfi-1) #:export (<color> diff --git a/2d/font.scm b/2d/font.scm index 2ba82f0..4e9d401 100644 --- a/2d/font.scm +++ b/2d/font.scm @@ -22,13 +22,12 @@ ;;; Code: (define-module (2d font) - #:use-module (figl gl) #:use-module (srfi srfi-9) #:use-module (system foreign) #:use-module ((sdl sdl) #:prefix SDL:) #:use-module ((sdl ttf) #:prefix SDL:) - #:use-module (figl gl) - #:use-module (figl contrib packed-struct) + #:use-module (gl) + #:use-module (gl contrib packed-struct) #:use-module (2d color) #:use-module (2d config) #:use-module (2d shader) diff --git a/2d/game.scm b/2d/game.scm index 292968f..a94a9c0 100644 --- a/2d/game.scm +++ b/2d/game.scm @@ -24,7 +24,7 @@ (define-module (2d game) #:use-module (srfi srfi-9) #:use-module ((sdl sdl) #:prefix SDL:) - #:use-module (figl gl) + #:use-module (gl) #:use-module (2d agenda) #:use-module (2d event) #:use-module (2d signal) diff --git a/2d/shader.scm b/2d/shader.scm index deff331..994dd63 100644 --- a/2d/shader.scm +++ b/2d/shader.scm @@ -22,8 +22,8 @@ #:use-module (srfi srfi-4) #:use-module (srfi srfi-9) #:use-module (ice-9 rdelim) - #:use-module (figl gl) - #:use-module (figl gl low-level) + #:use-module (gl) + #:use-module (gl low-level) #:use-module (2d helpers) #:use-module (2d transform) #:use-module (2d vector2) diff --git a/2d/sprite.scm b/2d/sprite.scm index 75a54dc..7c7b9c0 100644 --- a/2d/sprite.scm +++ b/2d/sprite.scm @@ -25,8 +25,8 @@ (define-module (2d sprite) #:use-module (srfi srfi-1) #:use-module (srfi srfi-9) - #:use-module (figl gl) - #:use-module (figl contrib packed-struct) + #:use-module (gl) + #:use-module (gl contrib packed-struct) #:use-module ((sdl sdl) #:prefix SDL:) #:use-module (2d agenda) #:use-module (2d animation) diff --git a/2d/texture.scm b/2d/texture.scm index aabe884..1ac3f05 100644 --- a/2d/texture.scm +++ b/2d/texture.scm @@ -24,8 +24,8 @@ (define-module (2d texture) #:use-module (srfi srfi-9) - #:use-module (figl gl) - #:use-module (figl contrib packed-struct) + #:use-module (gl) + #:use-module (gl contrib packed-struct) #:use-module (2d color) #:use-module (2d helpers) #:use-module (2d vector2) diff --git a/2d/vector2.scm b/2d/vector2.scm index bbbe19f..3c76625 100644 --- a/2d/vector2.scm +++ b/2d/vector2.scm @@ -22,7 +22,6 @@ ;;; Code: (define-module (2d vector2) - #:use-module (figl gl) #:use-module (srfi srfi-1) #:use-module (srfi srfi-9) #:export (<vector2> diff --git a/2d/window.scm b/2d/window.scm index 75f996b..a747acf 100644 --- a/2d/window.scm +++ b/2d/window.scm @@ -23,7 +23,7 @@ (define-module (2d window) #:use-module (srfi srfi-9) - #:use-module (figl gl) + #:use-module (gl) #:use-module ((sdl sdl) #:prefix SDL:) #:use-module ((sdl mixer) #:prefix SDL:) #:use-module (2d event) diff --git a/2d/wrappers/gl.scm b/2d/wrappers/gl.scm index 8e500d4..e43ba8a 100644 --- a/2d/wrappers/gl.scm +++ b/2d/wrappers/gl.scm @@ -18,12 +18,12 @@ ;;; Commentary: ;; ;; Custom wrappers over low level OpenGL commands that aren't part of -;; FIGL. +;; guile-opengl. ;; ;;; Code: (define-module (2d wrappers gl) - #:use-module ((figl gl low-level) #:renamer (symbol-prefix-proc '%))) + #:use-module ((gl low-level) #:renamer (symbol-prefix-proc '%))) ;;; ;;; 3.8.1 Texture Image Specification diff --git a/2d/wrappers/util.scm b/2d/wrappers/util.scm index 87cf434..254dc3a 100644 --- a/2d/wrappers/util.scm +++ b/2d/wrappers/util.scm @@ -24,7 +24,7 @@ (define-module (2d wrappers util) #:export (define-enumeration)) -;; Borrowed from guile-figl +;; Borrowed from guile-opengl (define-syntax-rule (define-enumeration enumerator (name value) ...) (define-syntax enumerator (lambda (x) diff --git a/INSTALL.org b/INSTALL.org index ca0d327..d52276f 100644 --- a/INSTALL.org +++ b/INSTALL.org @@ -63,40 +63,22 @@ for more information: https://github.com/davexunit/guile-2d/issues/2 -*** guile-figl +*** guile-opengl *Source* - FIGL is an unreleased library. You can find an unofficial - source tarball that is compatible with guile-2d here: - http://dthompson.us/static/src/guile-figl.tar.gz + guile-opengl is the GNU Guile wrapper for OpenGL. - #+BEGIN_SRC sh - tar -xvf guile-figl.tar.gz - cd guile-figl/ - ./configure --prefix=/usr - make - sudo make install - #+END_SRC - - *Git* + Grab the latest release tarball from http://ftp.gnu.org/gnu/guile-opengl/. #+BEGIN_SRC sh - git clone https://gitorious.org/guile-figl/guile-figl.git - cd guile-figl - autoreconf -vif + tar -xvf guile-opengl-<version>.tar.gz + cd guile-opengl/ ./configure --prefix=/usr make sudo make install #+END_SRC - You will probably encounter a syntax error in the - /low-level-gl.texi/ file. To fix it, you will need to join the - lines 19152 and 19153 together. There are a lot of warnings that - get output, but only one fatal error. The documentation is - auto-generated from the OpenGL docs and it seems that there are - still a few bugs in the generator. - ** Install guile-2d Once the dependencies have been installed, installing guile-2d is @@ -315,7 +315,7 @@ ** Dependencies - GNU Guile >= 2.0.9 - - [[https://gitorious.org/guile-figl/guile-figl][guile-figl]] (git master branch) + - [[http://www.gnu.org/software/guile-opengl/][guile-opengl]] >= 0.1.0 - [[https://www.gnu.org/software/guile-sdl/index.html][guile-sdl]] >= 0.5.0 - SDL 1.2 - FreeImage >= 3.0 |