mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2024-12-28 18:31:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

use stb font in emscripten (untested)

Browse Source
This commit is contained in:
radius 2018-09-30 17:39:14 -05:00
parent d74fd1e0f7
commit 3c8264e9f2
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.emscripten
View File

@ -7,7 +7,7 @@ PTHREAD = 0
OS = Emscripten OS = Emscripten
OBJ := OBJ :=
DEFINES := -DRARCH_INTERNAL -DHAVE_MAIN -s USE_PTHREADS=$(PTHREAD) DEFINES := -DRARCH_INTERNAL -DHAVE_MAIN -s USE_PTHREADS=$(PTHREAD)
DEFINES += -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DHAVE_GLSL -DHAVE_FILTERS_BUILTIN DEFINES += -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DHAVE_GLSL -DHAVE_FILTERS_BUILTIN -DHAVE_STB_FONT
HAVE_OVERLAY = 1 HAVE_OVERLAY = 1
HAVE_CC_RESAMPLER = 1 HAVE_CC_RESAMPLER = 1
@ -25,6 +25,7 @@ HAVE_SHADERPIPELINE = 1
HAVE_STATIC_VIDEO_FILTERS = 1 HAVE_STATIC_VIDEO_FILTERS = 1
HAVE_STATIC_AUDIO_FILTERS = 1 HAVE_STATIC_AUDIO_FILTERS = 1
MEMORY = 536870912 MEMORY = 536870912
HAVE_STB_FONT = 1
PRECISE_F32 = 1 PRECISE_F32 = 1

2
gfx/font_driver.c
View File

@ -34,7 +34,7 @@ static const font_renderer_driver_t *font_backends[] = {
&coretext_font_renderer, &coretext_font_renderer,
#endif #endif
#ifdef HAVE_STB_FONT #ifdef HAVE_STB_FONT
#if defined(VITA) || defined(WIIU) || defined(ANDROID) || defined(_WIN32) && !defined(_XBOX) && !defined(_MSC_VER) || (defined(_WIN32) && !defined(_XBOX) && defined(_MSC_VER) && _MSC_VER > 1400) || defined(__CELLOS_LV2__) || defined(HAVE_LIBNX) #if defined(VITA) || defined(WIIU) || defined(ANDROID) || defined(_WIN32) && !defined(_XBOX) && !defined(_MSC_VER) || (defined(_WIN32) && !defined(_XBOX) && defined(_MSC_VER) && _MSC_VER > 1400) || defined(__CELLOS_LV2__) || defined(HAVE_LIBNX) || defined (HAVE_EMSCRIPTEN)
&stb_unicode_font_renderer, &stb_unicode_font_renderer,
#else #else
&stb_font_renderer, &stb_font_renderer,