FMudanyali/FreeGLUT-Vita
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for the font binary compatibility problem.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@132 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
cjp 2003-07-11 17:50:22 +00:00
parent 0e0b702a93
commit 8dde4b4a17
2 changed files with 33 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
freeglut/freeglut/include/GL/glut.h
View File

@ -164,15 +164,15 @@
/* /*
* I don't really know if it's a good idea... But here it goes: * I don't really know if it's a good idea... But here it goes:
*/ */
extern void* glutStrokeRoman; extern struct _GLUTstrokeFont glutStrokeRoman;
extern void* glutStrokeMonoRoman; extern struct _GLUTstrokeFont glutStrokeMonoRoman;
extern void* glutBitmap9By15; extern struct _GLUTbitmapFont glutBitmap9By15;
extern void* glutBitmap8By13; extern struct _GLUTbitmapFont glutBitmap8By13;
extern void* glutBitmapTimesRoman10; extern struct _GLUTbitmapFont glutBitmapTimesRoman10;
extern void* glutBitmapTimesRoman24; extern struct _GLUTbitmapFont glutBitmapTimesRoman24;
extern void* glutBitmapHelvetica10; extern struct _GLUTbitmapFont glutBitmapHelvetica10;
extern void* glutBitmapHelvetica12; extern struct _GLUTbitmapFont glutBitmapHelvetica12;
extern void* glutBitmapHelvetica18; extern struct _GLUTbitmapFont glutBitmapHelvetica18;
/* /*
* Those pointers will be used by following definitions: * Those pointers will be used by following definitions:

33
freeglut/freeglut/src/freeglut_font.c
View File

@ -59,15 +59,30 @@ extern SFG_StrokeFont fgStrokeMonoRoman;
* This is for GLUT binary compatibility, as suggested by Steve Baker * This is for GLUT binary compatibility, as suggested by Steve Baker
*/ */
#if TARGET_HOST_UNIX_X11 #if TARGET_HOST_UNIX_X11
void* glutStrokeRoman; struct _GLUTstrokeFont {
void* glutStrokeMonoRoman; const char *name;
void* glutBitmap9By15; int num_chars;
void* glutBitmap8By13; void *ch;
void* glutBitmapTimesRoman10; float top;
void* glutBitmapTimesRoman24; float bottom;
void* glutBitmapHelvetica10; };
void* glutBitmapHelvetica12;
void* glutBitmapHelvetica18; struct _GLUTbitmapFont {
const char *name;
const int num_chars;
const int first;
const void *ch;
};
struct _GLUTstrokeFont glutStrokeRoman;
struct _GLUTstrokeFont glutStrokeMonoRoman;
struct _GLUTbitmapFont glutBitmap9By15;
struct _GLUTbitmapFont glutBitmap8By13;
struct _GLUTbitmapFont glutBitmapTimesRoman10;
struct _GLUTbitmapFont glutBitmapTimesRoman24;
struct _GLUTbitmapFont glutBitmapHelvetica10;
struct _GLUTbitmapFont glutBitmapHelvetica12;
struct _GLUTbitmapFont glutBitmapHelvetica18;
#endif #endif