Move font data to a subfolder

This commit is contained in:
Scott Lahteine 2018-10-24 03:38:13 -05:00
parent 774a6e8199
commit 8055ed24ff
34 changed files with 7 additions and 7 deletions

View file

@ -264,7 +264,7 @@
// LCD Menu Messages
#define LANGUAGE_DATA_INCL_(M) STRINGIFY_(language_data_##M.h)
#define LANGUAGE_DATA_INCL_(M) STRINGIFY_(fontdata/language_data_##M.h)
#define LANGUAGE_DATA_INCL(M) LANGUAGE_DATA_INCL_(M)
#define INCLUDE_LANGUAGE_DATA LANGUAGE_DATA_INCL(LCD_LANGUAGE)

View file

@ -60,7 +60,7 @@
#include "../../feature/bedlevel/ubl/ubl.h"
#endif
// The Marlin special symbols is now in the dogm_font_data_ISO10646_1.h
// The Marlin special symbols is now in the fontdata_ISO10646_1.h
#define FONT_SPECIAL_NAME ISO10646_1_5x7
// Only Western languages support big / small fonts
@ -70,7 +70,7 @@
#endif
#if ENABLED(USE_SMALL_INFOFONT)
#include "dogm_font_data_6x9_marlin.h"
#include "fontdata/fontdata_6x9_marlin.h"
#define FONT_STATUSMENU_NAME u8g_font_6x9
#define INFO_FONT_HEIGHT 7
#else
@ -80,7 +80,7 @@
#include LANGUAGE_DATA_INCL(LCD_LANGUAGE)
#include "dogm_font_data_ISO10646_1.h"
#include "fontdata/fontdata_ISO10646_1.h"
#define FONT_MENU_NAME ISO10646_1_5x7
// DOGM parameters (size in pixels)

View file

@ -64,13 +64,13 @@ for LANG in ${MARLIN_LANGS:=$LANGS_DEFAULT} ; do
${EXEC_WXGGEN} "${FN_FONT}"
sed -i fontutf8-data.h -e 's|fonts//|fonts/|g' -e 's|fonts//|fonts/|g' -e 's|[/0-9a-zA-Z_\-]*buildroot/share/fonts|buildroot/share/fonts|' 2>/dev/null
cd ../
mv ${DN_WORK}/fontutf8-data.h src/lcd/dogm/language_data_${LANG}.h
mv ${DN_WORK}/fontutf8-data.h src/lcd/dogm/fontdata/language_data_${LANG}.h
rm -rf ${DN_WORK}/
done
#
# Generate default ASCII font (char range 0-255):
# Marlin/src/lcd/dogm/dogm_font_data_ISO10646_1.h
# Marlin/src/lcd/dogm/fontdata/fontdata_ISO10646_1.h
#
#if [ "${MARLIN_LANGS}" == "${LANGS_DEFAULT}" ]; then
if [ 1 = 1 ]; then
@ -82,7 +82,7 @@ if [ 1 = 1 ]; then
TMP1=$(cat tmp1.h) ; rm tmp1.h
TMP2=$(cat tmp2.h) ; rm tmp2.h
cat <<EOF >../src/lcd/dogm/dogm_font_data_ISO10646_1.h
cat <<EOF >../src/lcd/dogm/fontdata/fontdata_ISO10646_1.h
/**
* Marlin 3D Printer Firmware
* Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]