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

Allowing "freeglut" to compile without errors under *nix. Before this, there were problems with conflicting definitions of the GLUT font definitions.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@760 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
fayjf 2008-11-17 14:50:08 +00:00
parent aebd3ade65
commit fe55b7f706
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,15 +54,6 @@ 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,6 +687,18 @@ 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;