projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Uploading spaceball/set-window patch per e-mail from John Tsiombikas dated 1:34 PM...
[freeglut]
/
src
/
freeglut_internal.h
diff --git
a/src/freeglut_internal.h
b/src/freeglut_internal.h
index
5b2784a
..
0ec9cc2
100644
(file)
--- a/
src/freeglut_internal.h
+++ b/
src/freeglut_internal.h
@@
-34,7
+34,7
@@
/* XXX Update these for each release! */
#define VERSION_MAJOR 2
/* XXX Update these for each release! */
#define VERSION_MAJOR 2
-#define VERSION_MINOR 6
+#define VERSION_MINOR 7
#define VERSION_PATCH 0
/* Freeglut is intended to function under all Unix/X11 and Win32 platforms. */
#define VERSION_PATCH 0
/* Freeglut is intended to function under all Unix/X11 and Win32 platforms. */
@@
-49,9
+49,11
@@
#elif defined(__posix__) || defined(__unix__) || defined(__linux__)
# define TARGET_HOST_POSIX_X11 1
#elif defined(__posix__) || defined(__unix__) || defined(__linux__)
# define TARGET_HOST_POSIX_X11 1
-/* FIXME: no Macintosh support?
-#if ...
-# define TARGET_HOST_MAC_OSX 1
+#elif defined(__APPLE__)
+/* This is a placeholder until we get native OSX support ironed out -- JFF 11/18/09 */
+# define TARGET_HOST_POSIX_X11 1
+/* # define TARGET_HOST_MAC_OSX 1 */
+
#else
# error "Unrecognized target host!"
*/
#else
# error "Unrecognized target host!"
*/
@@
-436,6
+438,8
@@
struct tagSFG_WindowState
GLboolean KeyRepeating; /* Currently in repeat mode */
GLboolean NeedToResize; /* Do we need to resize the window? */
GLboolean KeyRepeating; /* Currently in repeat mode */
GLboolean NeedToResize; /* Do we need to resize the window? */
+
+ GLboolean IsFullscreen; /* is the window fullscreen? */
};
};