mirror of
https://github.com/nzp-team/fteqw.git
synced 2024-11-26 13:50:53 +00:00
more verbose on errors. also load up the right shared object on non-windows.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4395 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
parent
34f418435d
commit
3c1c9a3c65
1 changed files with 10 additions and 0 deletions
|
@ -659,12 +659,20 @@ qboolean Font_LoadFreeTypeFont(struct font_s *f, int height, char *fontfilename)
|
||||||
return false;
|
return false;
|
||||||
triedtoloadfreetype = true;
|
triedtoloadfreetype = true;
|
||||||
|
|
||||||
|
#ifdef _WIN32
|
||||||
fontmodule = Sys_LoadLibrary("freetype6", ft2funcs);
|
fontmodule = Sys_LoadLibrary("freetype6", ft2funcs);
|
||||||
|
#else
|
||||||
|
fontmodule = Sys_LoadLibrary("libfreetype.so.6", ft2funcs);
|
||||||
|
#endif
|
||||||
if (!fontmodule)
|
if (!fontmodule)
|
||||||
|
{
|
||||||
|
Con_Printf("Couldn't load freetype library.\n");
|
||||||
return false;
|
return false;
|
||||||
|
}
|
||||||
error = pFT_Init_FreeType(&fontlib);
|
error = pFT_Init_FreeType(&fontlib);
|
||||||
if (error)
|
if (error)
|
||||||
{
|
{
|
||||||
|
Con_Printf("FT_Init_FreeType failed.\n");
|
||||||
Sys_CloseLibrary(fontmodule);
|
Sys_CloseLibrary(fontmodule);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -738,6 +746,8 @@ qboolean Font_LoadFreeTypeFont(struct font_s *f, int height, char *fontfilename)
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (error && error != FT_Err_Cannot_Open_Resource)
|
||||||
|
Con_Printf("Freetype error: %i\n", error);
|
||||||
if (fbase)
|
if (fbase)
|
||||||
BZ_Free(fbase);
|
BZ_Free(fbase);
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in a new issue