summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Thompson <davet@gnu.org>2015-05-14 17:48:29 -0400
committerDavid Thompson <davet@gnu.org>2015-05-14 17:48:29 -0400
commit2e070a480bce326eeae5c9486d220ec39cb9ed14 (patch)
tree5d40baaa806932dd4c426c7cef81b2eb48131672
parentc2d467c6e7539548366c14606569d181abdc1d4b (diff)
sandbox: Generate script with autoconf.
* sandbox: Delete. * .gitignore: Ignore it. * sandbox.in: New file. * configure.ac: Generate sandbox.
-rw-r--r--.gitignore1
-rw-r--r--configure.ac2
-rw-r--r--[-rwxr-xr-x]sandbox.in (renamed from sandbox)8
3 files changed, 6 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore
index f5c9fba..435ffa7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,4 @@ Makefile.in
/2d/config.scm
/pre-inst-env
/sly/config.scm
+/sandbox
diff --git a/configure.ac b/configure.ac
index 3aab2ab..07e955a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,9 +6,11 @@ AC_CONFIG_AUX_DIR([build-aux])
AM_INIT_AUTOMAKE([color-tests -Wall -Wno-portability foreign])
AM_SILENT_RULES([yes])
+AC_PATH_PROG([GUILE], [guile])
AC_CONFIG_FILES([Makefile doc/Makefile examples/Makefile data/Makefile])
AC_CONFIG_FILES([env], [chmod +x env])
AC_CONFIG_FILES([pre-inst-env], [chmod +x pre-inst-env])
+AC_CONFIG_FILES([sandbox], [chmod +x sandbox])
GUILE_PROGS([2.0.11])
GUILE_MODULE_REQUIRED([sdl sdl])
diff --git a/sandbox b/sandbox.in
index 024408b..40c92b5 100755..100644
--- a/sandbox
+++ b/sandbox.in
@@ -1,4 +1,4 @@
-#! /usr/bin/guile \
+#!@GUILE@ \
-L . -s
!#
@@ -31,7 +31,6 @@
(sly render font)
(sly render sprite)
(sly render texture)
- (sly render group)
(sly render model)
(sly render camera)
(sly input keyboard)
@@ -47,8 +46,7 @@
(display "Welcome to the Sly sandbox. Happy hacking!\n")
-(define-signal scene
- (group))
+(define-signal scene null-model)
(define-signal camera
(orthographic-camera 640 480))
@@ -56,7 +54,7 @@
(define (draw-scene dt alpha)
(signal-let ((scene scene)
(camera camera))
- (draw-group scene camera)))
+ (draw-model scene camera)))
(add-hook! draw-hook (trampoline draw-scene))