Merge pull request #43 from nillerusr/ToGLES3

ToGLES, and some other shit
This commit is contained in:
nillerusr
2022-02-05 21:45:29 +03:00
committed by GitHub
230 changed files with 42019 additions and 46508 deletions
+4 -4
View File
@@ -418,9 +418,9 @@ char *FindFontAndroid(bool bBold, int italic)
else if( italic )
fontFileNamePost = "Italic";
else
fontFileName = "Regular";
fontFileNamePost = "Regular";
char dataFile[MAX_PATH];
static char dataFile[MAX_PATH];
if( fontFileNamePost )
snprintf( dataFile, sizeof dataFile, "/system/fonts/%s-%s.ttf", fontFileName, fontFileNamePost );
@@ -431,7 +431,7 @@ char *FindFontAndroid(bool bBold, int italic)
{
fontFileNamePost = NULL;
fontFileName = "DroidSans";
if( bBold > 500 )
if( bBold )
fontFileNamePost = "Bold";
if( fontFileNamePost )
@@ -464,7 +464,7 @@ char *CLinuxFont::GetFontFileName( const char *windowsFontName, int flags )
#ifdef ANDROID
char *filename = FindFontAndroid( bBold, italic );
Msg("Android font: %s", filename);
Msg("Android font: %s\n", filename);
if( !filename ) return NULL;
return strdup( filename );
#else