bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

[2.0.x] Fix problems compiling with Arduino IDE (#10441)

Browse Source 
* Fix problems compiling u8glib utf8 support on Arduino
* Change header in auto-generated font data
* Change include in font gen scripts
This commit is contained in:
Chris Pepper
2018-04-17 23:28:55 +01:00
committed by Scott Lahteine
parent 20772492aa
commit 744bcaee61
34 changed files with 52 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
buildroot/share/fonts/genallfont.sh
View File

@@ -101,10 +101,7 @@ EOF
#endif
EOF
sed -e 's|#include "u8g.h"|#include <clib/u8g.h>|' -i tmp3.h
cd ..
mv ${DN_WORK}/tmp3.h src/lcd/dogm/dogm_font_data_ISO10646_1.h
fi

2
buildroot/share/fonts/uxggenpages.sh
View File

@@ -154,7 +154,7 @@ echo "/* Generated by $0 */" >> fontutf8-data.h
echo "/* This file is generated automatically, any changes to the file may be REPLACED by future processing. */" >> fontutf8-data.h
echo "/* Please turn to the tools call this script to change the contents! */" >> fontutf8-data.h
echo "" >> fontutf8-data.h
echo "#include <u8g.h>" >> fontutf8-data.h
echo "#include <U8glib.h>" >> fontutf8-data.h
#echo "#include \"fontutf8u8g.h\"" >> fontutf8-data.h
echo "" >> fontutf8-data.h
cat tmpa >> fontutf8-data.h