aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2012-04-05 14:05:06 -0700
committerAlon Zakai <alonzakai@gmail.com>2012-04-05 14:05:06 -0700
commitc3f11717a5f56c71897f836a829bbec1a00b44b6 (patch)
treec04b399e2168d5e4a60f629722a9790354b3a1fe
parent270e442e15d3327534ee8e6dc8285c9873babb84 (diff)
parent4f833572c5d7e759045a03d5b61a4252684c30b8 (diff)
Merge pull request #356 from behdad/outgoing
Make gears animate again
-rw-r--r--src/library_glut.js2
-rw-r--r--tests/hello_world_gles.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/library_glut.js b/src/library_glut.js
index bbcba7d4..234666ca 100644
--- a/src/library_glut.js
+++ b/src/library_glut.js
@@ -427,7 +427,7 @@ var LibraryGLUT = {
}
},
- glutMainLoop__deps: ['$GLUT', 'glutPostRedisplay'],
+ glutMainLoop__deps: ['$GLUT', 'glutReshapeWindow', 'glutPostRedisplay'],
glutMainLoop: function() {
window.addEventListener("keydown", GLUT.onKeydown, true);
diff --git a/tests/hello_world_gles.c b/tests/hello_world_gles.c
index 088b9dae..6f7a4324 100644
--- a/tests/hello_world_gles.c
+++ b/tests/hello_world_gles.c
@@ -59,6 +59,7 @@
#define GEAR_VERTEX_STRIDE 6
#ifndef HAVE_BUILTIN_SINCOS
+#define sincos _sincos
static void
sincos (double a, double *s, double *c)
{