mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-06 09:40:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prevent stb_truetype from being included twice for Griffin

Browse Source
This commit is contained in:
twinaphex 2016-11-05 20:45:23 +01:00
parent a092f4d383
commit 37ff8cb66f
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.common
View File

@ -553,6 +553,7 @@ endif
ifeq ($(HAVE_STB_FONT), 1) ifeq ($(HAVE_STB_FONT), 1)
OBJ += gfx/drivers_font_renderer/stb.o OBJ += gfx/drivers_font_renderer/stb.o
OBJ += gfx/drivers_font_renderer/stb_unicode.o
endif endif
ifeq ($(HAVE_FREETYPE), 1) ifeq ($(HAVE_FREETYPE), 1)

2
gfx/drivers_font_renderer/stb.c
View File

@ -23,6 +23,7 @@
#include "../font_driver.h" #include "../font_driver.h"
#include "../../verbosity.h" #include "../../verbosity.h"
#ifndef STB_TRUETYPE_IMPLEMENTATION
#define STB_TRUETYPE_IMPLEMENTATION #define STB_TRUETYPE_IMPLEMENTATION
#define STB_RECT_PACK_IMPLEMENTATION #define STB_RECT_PACK_IMPLEMENTATION
#define STBTT_STATIC #define STBTT_STATIC
@ -30,6 +31,7 @@
#include "../../deps/stb/stb_rect_pack.h" #include "../../deps/stb/stb_rect_pack.h"
#include "../../deps/stb/stb_truetype.h" #include "../../deps/stb/stb_truetype.h"
#undef static #undef static
#endif
typedef struct typedef struct
{ {

5
gfx/drivers_font_renderer/stb_unicode.c
View File

@ -23,6 +23,7 @@
#include "../font_driver.h" #include "../font_driver.h"
#include "../../verbosity.h" #include "../../verbosity.h"
#ifndef STB_TRUETYPE_IMPLEMENTATION
#define STB_TRUETYPE_IMPLEMENTATION #define STB_TRUETYPE_IMPLEMENTATION
#define STB_RECT_PACK_IMPLEMENTATION #define STB_RECT_PACK_IMPLEMENTATION
#define STBRP_STATIC #define STBRP_STATIC
@ -31,6 +32,7 @@
#include "../../deps/stb/stb_rect_pack.h" #include "../../deps/stb/stb_rect_pack.h"
#include "../../deps/stb/stb_truetype.h" #include "../../deps/stb/stb_truetype.h"
#undef static #undef static
#endif
typedef struct typedef struct
{ {
@ -118,8 +120,6 @@ static uint32_t font_renderer_stb_unicode_update_atlas(stb_unicode_font_renderer
glyph->draw_offset_y = - y1 * self->scale_factor; glyph->draw_offset_y = - y1 * self->scale_factor;
glyph->width = self->max_glyph_width; glyph->width = self->max_glyph_width;
glyph->height = self->max_glyph_height; glyph->height = self->max_glyph_height;
// glyph->width = (x1 + x0 ) * self->scale_factor;
// glyph->height = (y1 - y0 ) * self->scale_factor;
return id; return id;
} }
@ -203,7 +203,6 @@ static void *font_renderer_stb_unicode_init(const char *font_path, float font_si
else else
self->scale_factor = stbtt_ScaleForPixelHeight(&self->info, font_size); self->scale_factor = stbtt_ScaleForPixelHeight(&self->info, font_size);
// self->line_height = (ascent - descent + line_gap) * self->scale_factor;
self->line_height = (ascent - descent) * self->scale_factor; self->line_height = (ascent - descent) * self->scale_factor;
if (!font_renderer_stb_unicode_create_atlas(self, font_size)) if (!font_renderer_stb_unicode_create_atlas(self, font_size))

3
griffin/griffin.c
View File

@ -354,12 +354,9 @@ FONTS
#include "../gfx/font_driver.c" #include "../gfx/font_driver.c"
#if defined(HAVE_STB_FONT) #if defined(HAVE_STB_FONT)
#if defined(VITA) || defined(ANDROID) || defined(_WIN32) && !defined(_XBOX)
#include "../gfx/drivers_font_renderer/stb_unicode.c" #include "../gfx/drivers_font_renderer/stb_unicode.c"
#else
#include "../gfx/drivers_font_renderer/stb.c" #include "../gfx/drivers_font_renderer/stb.c"
#endif #endif
#endif
#if defined(HAVE_FREETYPE) #if defined(HAVE_FREETYPE)
#include "../gfx/drivers_font_renderer/freetype.c" #include "../gfx/drivers_font_renderer/freetype.c"