projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added FREEGLUT_VERSION_1_3.
[freeglut]
/
freeglut-1.3
/
freeglut_internal.h
diff --git
a/freeglut-1.3/freeglut_internal.h
b/freeglut-1.3/freeglut_internal.h
index
977e69d
..
e4968e9
100644
(file)
--- a/
freeglut-1.3/freeglut_internal.h
+++ b/
freeglut-1.3/freeglut_internal.h
@@
-29,6
+29,13
@@
#define FREEGLUT_INTERNAL_H
/*
#define FREEGLUT_INTERNAL_H
/*
+ * Be sure to update these for every release!
+ */
+#define VERSION_MAJOR 1
+#define VERSION_MINOR 3
+#define VERSION_PATCH 0
+
+/*
* Freeglut is meant to be available under all Unix/X11 and Win32 platforms.
*/
#if !defined(_WIN32)
* Freeglut is meant to be available under all Unix/X11 and Win32 platforms.
*/
#if !defined(_WIN32)
@@
-84,10
+91,9
@@
#include <X11/Xatom.h>
#include <X11/keysym.h>
#include <X11/Xatom.h>
#include <X11/keysym.h>
- /*
- * This will generate errors, but I don't have any idea how to fix it (will autoconf help?)
- */
+ #ifndef __sgi
#include <X11/extensions/xf86vmode.h>
#include <X11/extensions/xf86vmode.h>
+ #endif
#endif
/*
#endif
/*
@@
-221,6
+227,10
@@
struct tagSFG_State
GLboolean IgnoreKeyRepeat; /* Whether to ignore key repeat... */
GLboolean IgnoreKeyRepeat; /* Whether to ignore key repeat... */
+ GLuint FPSInterval; /* Interval between FPS printfs */
+ GLuint SwapCount; /* Count of glutSwapBuffer calls */
+ GLuint SwapTime; /* Time of last SwapBuffers */
+
SFG_Time Time; /* The time that glutInit was called */
SFG_List Timers; /* The freeglut timer hooks */
SFG_Time Time; /* The time that glutInit was called */
SFG_List Timers; /* The freeglut timer hooks */
@@
-289,16
+299,18
@@
typedef struct tagSFG_Context SFG_Context;
struct tagSFG_Context
{
#if TARGET_HOST_UNIX_X11
struct tagSFG_Context
{
#if TARGET_HOST_UNIX_X11
- Window Handle; /* The window's handle */
- GLXContext Context; /* The OpenGL context */
- XVisualInfo* VisualInfo; /* The window's visual information */
+ Window Handle; /* The window's handle */
+ GLXContext Context; /* The OpenGL context */
+ XVisualInfo* VisualInfo; /* The window's visual information */
#elif TARGET_HOST_WIN32
#elif TARGET_HOST_WIN32
- HWND Handle; /* The window's handle */
- HDC Device; /* The window's device context */
- HGLRC Context; /* The window's WGL context */
+ HWND Handle; /* The window's handle */
+ HDC Device; /* The window's device context */
+ HGLRC Context; /* The window's WGL context */
#endif
#endif
+
+ int DoubleBuffered; /* Treat the window as double-buffered */
};
/*
};
/*