fte/fteqw
2
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity

compile even with no freetype support

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4569 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2013-12-19 16:38:36 +00:00
parent 4a19ae4627
commit d4e312b398
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
engine/gl/gl_font.c
View file

@ -163,6 +163,7 @@ static const char *imgs[] =
#define PLANEWIDTH (1<<8) #define PLANEWIDTH (1<<8)
#define PLANEHEIGHT PLANEWIDTH #define PLANEHEIGHT PLANEWIDTH
#ifdef AVAIL_FREETYPE
//windows' font linking allows linking multiple extra fonts to a main font. //windows' font linking allows linking multiple extra fonts to a main font.
//this means that a single selected font can use chars from lots of different files if the first one(s) didn't provide that font. //this means that a single selected font can use chars from lots of different files if the first one(s) didn't provide that font.
//they're provided as fallbacks. //they're provided as fallbacks.
@ -179,6 +180,7 @@ typedef struct ftfontface_s
void *membuf; void *membuf;
} ftfontface_t; } ftfontface_t;
static ftfontface_t *ftfaces; static ftfontface_t *ftfaces;
#endif
#define GEN_CONCHAR_GLYPHS 0 //set to 0 or 1 to define whether to generate glyphs from conchars too, or if it should just draw them as glquake always used to #define GEN_CONCHAR_GLYPHS 0 //set to 0 or 1 to define whether to generate glyphs from conchars too, or if it should just draw them as glquake always used to
@ -1226,7 +1228,9 @@ struct font_s *Font_LoadFont(int vheight, char *fontfilename)
} }
} }
#ifdef AVAIL_FREETYPE
if (!f->ftfaces) if (!f->ftfaces)
#endif
{ {
//default to only map the ascii-compatible chars from the quake font. //default to only map the ascii-compatible chars from the quake font.
if (*fontfilename) if (*fontfilename)