MapleShrine
/
mkxp
1
0
Fork 0
Code Issues 32 Pull Requests 11 Projects Releases Wiki Activity

Make it easier to change the bundled font. #136

Open
mook wants to merge 1 commits from mook/bundled-font-config into master
pull from: mook/bundled-font-config
merge into: MapleShrine:master
Conversation 3 Commits 1 Files Changed 4 +16 -10
4 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -8,6 +8,8 @@ option(WORKDIR_CURRENT "Keep current directory on startup" OFF)
option(FORCE32 "Force 32bit compile on 64bit OS" OFF) option(FORCE32 "Force 32bit compile on 64bit OS" OFF)
set(BINDING "MRI" CACHE STRING "The Binding Type (MRI, MRUBY, NULL)") set(BINDING "MRI" CACHE STRING "The Binding Type (MRI, MRUBY, NULL)")
set(EXTERNAL_LIB_PATH "" CACHE PATH "External precompiled lib prefix") set(EXTERNAL_LIB_PATH "" CACHE PATH "External precompiled lib prefix")
set(BUNDLED_FONT "liberation" CACHE STRING "Bundled font name; file must exist in assets")
set_property(CACHE BUNDLED_FONT PROPERTY ADVANCED ON)
## Misc setup ## ## Misc setup ##
@ -234,7 +236,7 @@ set(EMBEDDED_INPUT
shader/blurH.vert shader/blurH.vert
shader/blurV.vert shader/blurV.vert
shader/simpleMatrix.vert shader/simpleMatrix.vert
assets/liberation.ttf assets/${BUNDLED_FONT}.ttf
assets/icon.png assets/icon.png
) )
@ -402,6 +404,7 @@ add_executable(${PROJECT_NAME} MACOSX_BUNDLE
target_compile_definitions(${PROJECT_NAME} PRIVATE target_compile_definitions(${PROJECT_NAME} PRIVATE
${DEFINES} ${DEFINES}
BUNDLED_FONT=${BUNDLED_FONT}
) )
target_include_directories(${PROJECT_NAME} PRIVATE target_include_directories(${PROJECT_NAME} PRIVATE
src src

2
mkxp.pro
View File

@ -222,6 +222,8 @@ defineReplace(xxdOutput) {
return($$basename(1).xxd) return($$basename(1).xxd)
} }
DEFINES += BUNDLED_FONT=liberation
# xxd # xxd
xxd.output_function = xxdOutput xxd.output_function = xxdOutput
xxd.commands = xxd -i ${QMAKE_FILE_NAME} > ${QMAKE_FILE_OUT} xxd.commands = xxd -i ${QMAKE_FILE_NAME} > ${QMAKE_FILE_OUT}

5
src/bundledfont.cpp
View File

@ -1 +1,4 @@
#include "liberation.ttf.xxd" #define BUNDLED_FONT_NAME BUNDLED_FONT.ttf.xxd
#define STRINGIFY(x) #x
#define INCLUDE_FILE(x) STRINGIFY(x)
#include INCLUDE_FILE(BUNDLED_FONT_NAME)

14
src/font.cpp
View File

@ -33,17 +33,15 @@
#include <SDL_ttf.h> #include <SDL_ttf.h>
#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
#define BUNDLED_FONT_DECL(FONT) \
extern unsigned char BUNDLED_FONT_D(FONT)[]; \
extern unsigned int BUNDLED_FONT_L(FONT);
BUNDLED_FONT_DECL(BUNDLED_FONT)
// Go fuck yourself CPP // Go fuck yourself CPP
#define BNDL_F_D(f) BUNDLED_FONT_D(f) #define BNDL_F_D(f) BUNDLED_FONT_D(f)
#define BNDL_F_L(f) BUNDLED_FONT_L(f) #define BNDL_F_L(f) BUNDLED_FONT_L(f)