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
/
gltrackball.c
diff --git
a/hacks/glx/gltrackball.c
b/hacks/glx/gltrackball.c
index d02e316ae62e85a1b9f1cade3f3055bcca0b7013..c0ccaa133d54f246f8e53a170b63733a8c40333b 100644
(file)
--- a/
hacks/glx/gltrackball.c
+++ b/
hacks/glx/gltrackball.c
@@
-1,4
+1,4
@@
-/* gltrackball, Copyright (c) 2002-20
08
Jamie Zawinski <jwz@jwz.org>
+/* gltrackball, Copyright (c) 2002-20
12
Jamie Zawinski <jwz@jwz.org>
* GL-flavored wrapper for trackball.c
*
* Permission to use, copy, modify, distribute, and sell this software and its
* GL-flavored wrapper for trackball.c
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@
-18,12
+18,14
@@
# include "config.h"
#endif
# include "config.h"
#endif
-#ifdef HAVE_COCOA
-# include <OpenGL/gl.h>
-#else
+#ifndef HAVE_COCOA
# include <GL/gl.h>
#endif
# include <GL/gl.h>
#endif
+#ifdef HAVE_JWZGLES
+# include "jwzgles.h"
+#endif /* HAVE_JWZGLES */
+
#include "trackball.h"
#include "gltrackball.h"
#include "trackball.h"
#include "gltrackball.h"