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.35.tar.gz
[xscreensaver]
/
hacks
/
glx
/
atlantis.h
diff --git
a/hacks/glx/atlantis.h
b/hacks/glx/atlantis.h
index 1aba83033e35cd2524f1ee7487f581e66876c5ac..3b24bfab32526b702a8dc01b0ff54f4a4f910447 100644
(file)
--- a/
hacks/glx/atlantis.h
+++ b/
hacks/glx/atlantis.h
@@
-68,18
+68,28
@@
* OpenGL(TM) is a trademark of Silicon Graphics, Inc.
*/
* OpenGL(TM) is a trademark of Silicon Graphics, Inc.
*/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif /* HAVE_CONFIG_H */
+
#ifdef STANDALONE
# include <math.h>
# include "screenhackI.h"
#ifdef STANDALONE
# include <math.h>
# include "screenhackI.h"
-# ifdef HAVE_COCOA
-# include <OpenGL/gl.h>
-# else
+# ifndef HAVE_JWXYZ
# include <GL/gl.h>
# include <GL/glx.h>
# endif
#else
# include "xlock.h"
#endif
# include <GL/gl.h>
# include <GL/glx.h>
# endif
#else
# include "xlock.h"
#endif
+#ifdef HAVE_ANDROID
+#include <GLES/gl.h>
+#endif
+
+
+#ifdef HAVE_JWZGLES
+# include "jwzgles.h"
+#endif /* HAVE_JWZGLES */
#define RAD 57.295
#define RRAD 0.01745
#define RAD 57.295
#define RRAD 0.01745