Ancurio/mkxp-freebird
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Put bundled font into its own translation unit

Browse source
This commit is contained in:
Jonas Kulla 2014-08-16 23:20:33 +02:00
parent cbdd19e525
commit 4daff93e29
4 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CMakeLists.txt
View file

@ -184,6 +184,7 @@ set(MAIN_SOURCE
src/alstream.cpp src/alstream.cpp
src/audiostream.cpp src/audiostream.cpp
src/rgssad.cpp src/rgssad.cpp
src/bundledfont.cpp
) )
source_group("MKXP Source" FILES ${MAIN_SOURCE} ${MAIN_HEADERS}) source_group("MKXP Source" FILES ${MAIN_SOURCE} ${MAIN_HEADERS})

3
mkxp.pro
View file

@ -176,7 +176,8 @@ SOURCES += \
src/sdlsoundsource.cpp \ src/sdlsoundsource.cpp \
src/alstream.cpp \ src/alstream.cpp \
src/audiostream.cpp \ src/audiostream.cpp \
src/rgssad.cpp src/rgssad.cpp \
src/bundledfont.cpp
EMBED = \ EMBED = \
shader/transSimple.frag \ shader/transSimple.frag \

1
src/bundledfont.cpp Normal file
View file

@ -0,0 +1 @@
#include "../liberation.ttf.xxd"

8
src/font.cpp
View file

@ -31,12 +31,16 @@
#include <string> #include <string>
#include <utility> #include <utility>
#include "../liberation.ttf.xxd"
#include <SDL_ttf.h> #include <SDL_ttf.h>
#define BUNDLED_FONT liberation #define BUNDLED_FONT liberation
#define BUNDLED_FONT_DECL(FONT) \
extern unsigned char assets_##FONT##_ttf[]; \
extern unsigned int assets_##FONT##_ttf_len;
BUNDLED_FONT_DECL(liberation)
#define BUNDLED_FONT_D(f) assets_## f ##_ttf #define BUNDLED_FONT_D(f) assets_## f ##_ttf
#define BUNDLED_FONT_L(f) assets_## f ##_ttf_len #define BUNDLED_FONT_L(f) assets_## f ##_ttf_len