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

Yet another try to make the font definitions compile on all platforms.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@761 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
spanne 2008-11-20 11:59:29 +00:00
parent fe55b7f706
commit f0c1c62112
2 changed files with 40 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
freeglut/freeglut/src/freeglut_glutfont_definitions.c
View File

@ -40,7 +40,37 @@
* structure to match GLUT. * structure to match GLUT.
*/ */
#include <GL/freeglut.h> /*
* freeglut_internal.h uses some GL types, but including the GL header portably
* is a bit tricky, so we include freeglut_std.h here, which contains the
* necessary machinery. But this poses another problem, caused by the ugly
* original defintion of the font constants in "classic" GLUT: They are defined
* as void* externally, so we move them temporarily out of the way by AN EXTREME
* CPP HACK.
*/
#define glutStrokeRoman glutStrokeRomanIGNOREME
#define glutStrokeMonoRoman glutStrokeMonoRomanIGNOREME
#define glutBitmap9By15 glutBitmap9By15IGNOREME
#define glutBitmap8By13 glutBitmap8By13IGNOREME
#define glutBitmapTimesRoman10 glutBitmapTimesRoman10IGNOREME
#define glutBitmapTimesRoman24 glutBitmapTimesRoman24IGNOREME
#define glutBitmapHelvetica10 glutBitmapHelvetica10IGNOREME
#define glutBitmapHelvetica12 glutBitmapHelvetica12IGNOREME
#define glutBitmapHelvetica18 glutBitmapHelvetica18IGNOREME
#include <GL/freeglut_std.h>
#undef glutStrokeRoman
#undef glutStrokeMonoRoman
#undef glutBitmap9By15
#undef glutBitmap8By13
#undef glutBitmapTimesRoman10
#undef glutBitmapTimesRoman24
#undef glutBitmapHelvetica10
#undef glutBitmapHelvetica12
#undef glutBitmapHelvetica18
#include "freeglut_internal.h" #include "freeglut_internal.h"
#if TARGET_HOST_POSIX_X11 #if TARGET_HOST_POSIX_X11
@ -54,6 +84,15 @@ struct freeglutStrokeFont
float bottom ; float bottom ;
}; };
struct freeglutBitmapFont
{
const char *name ;
const int num_chars ;
const int first ;
const void *ch ;
};
struct freeglutStrokeFont glutStrokeRoman ; struct freeglutStrokeFont glutStrokeRoman ;
struct freeglutStrokeFont glutStrokeMonoRoman ; struct freeglutStrokeFont glutStrokeMonoRoman ;

12
freeglut/freeglut/src/freeglut_internal.h
View File

@ -687,18 +687,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 */ /* The stroke font structures */
typedef struct tagSFG_StrokeVertex SFG_StrokeVertex; typedef struct tagSFG_StrokeVertex SFG_StrokeVertex;