projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
From http://www.jwz.org/xscreensaver/xscreensaver-5.16.tar.gz
[xscreensaver]
/
hacks
/
glx
/
teapot.c
diff --git
a/hacks/glx/teapot.c
b/hacks/glx/teapot.c
index 373a8b221b1c1e91fa5736759762fdc6c50c4d04..3fc95ee3fe885ddf77485e3f7bef5bcdbc9ab99f 100644
(file)
--- a/
hacks/glx/teapot.c
+++ b/
hacks/glx/teapot.c
@@
-50,12
+50,19
@@
OpenGL(TM) is a trademark of Silicon Graphics, Inc.
#include "teapot.h"
#include "teapot.h"
-#ifdef HAVE_COCOA
-# include <OpenGL/gl.h>
-#else
+#ifdef HAVE_JWZGLES
+int unit_teapot (int grid, int wire_p) { return 0; }
+#else /* !HAVE_JWZGLES */
+
+
+#ifndef HAVE_COCOA
# include <GL/gl.h>
#endif
# include <GL/gl.h>
#endif
+#ifdef HAVE_JWZGLES
+# include "jwzgles.h"
+#endif /* HAVE_JWZGLES */
+
/* Rim, body, lid, and bottom data must be reflected in x
and y; handle and spout data across the y axis only. */
/* Rim, body, lid, and bottom data must be reflected in x
and y; handle and spout data across the y axis only. */
@@
-212,3
+219,5
@@
unit_teapot (int grid, int wire_p)
return polys;
}
return polys;
}
+
+#endif /* !HAVE_JWZGLES */