projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
We are at version 2.6.0 now.
[freeglut]
/
src
/
freeglut_internal.h
diff --git
a/src/freeglut_internal.h
b/src/freeglut_internal.h
index
f7155d5
..
e7540b0
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 4
+#define VERSION_MINOR 6
#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. */
@@
-57,6
+57,11
@@
*/
#endif
*/
#endif
+/* Detect both SunPro and gcc compilers on Sun Solaris */
+#if defined (__SVR4) && defined (__sun)
+# define TARGET_HOST_SOLARIS 1
+#endif
+
#ifndef TARGET_HOST_MS_WINDOWS
# define TARGET_HOST_MS_WINDOWS 0
#endif
#ifndef TARGET_HOST_MS_WINDOWS
# define TARGET_HOST_MS_WINDOWS 0
#endif
@@
-69,6
+74,10
@@
# define TARGET_HOST_MAC_OSX 0
#endif
# define TARGET_HOST_MAC_OSX 0
#endif
+#ifndef TARGET_HOST_SOLARIS
+# define TARGET_HOST_SOLARIS 0
+#endif
+
/* -- FIXED CONFIGURATION LIMITS ------------------------------------------- */
#define FREEGLUT_MAX_MENUS 3
/* -- FIXED CONFIGURATION LIMITS ------------------------------------------- */
#define FREEGLUT_MAX_MENUS 3
@@
-687,18
+696,6
@@
struct tagSFG_Font
float xorig, yorig; /* Relative origin of the character */
};
float xorig, yorig; /* Relative origin of the character */
};
-#if TARGET_HOST_POSIX_X11
-
-struct freeglutBitmapFont
-{
- const char *name ;
- const int num_chars ;
- const int first ;
- const void *ch ;
-};
-
-#endif
-
/* The stroke font structures */
typedef struct tagSFG_StrokeVertex SFG_StrokeVertex;
/* The stroke font structures */
typedef struct tagSFG_StrokeVertex SFG_StrokeVertex;
@@
-816,6
+813,7
@@
GLXFBConfig* fgChooseFBConfig( void );
#if TARGET_HOST_MS_WINDOWS
LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg,
WPARAM wParam, LPARAM lParam );
#if TARGET_HOST_MS_WINDOWS
LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg,
WPARAM wParam, LPARAM lParam );
+void fgNewWGLCreateContext( SFG_Window* window );
GLboolean fgSetupPixelFormat( SFG_Window* window, GLboolean checkOnly,
unsigned char layer_type );
#endif
GLboolean fgSetupPixelFormat( SFG_Window* window, GLboolean checkOnly,
unsigned char layer_type );
#endif