aboutsummaryrefslogtreecommitdiffstats
path: root/src/gdisp/fonts
diff options
context:
space:
mode:
authorinmarket <andrewh@inmarket.com.au>2015-06-08 14:14:40 +1000
committerinmarket <andrewh@inmarket.com.au>2015-06-08 14:14:40 +1000
commitccde54722f2c284fb0e7fc273d65c57a3be71db1 (patch)
treefffa49870c73d7e9d5caaf5c6d1d47cf0e5c90d3 /src/gdisp/fonts
parente850c344b818f21a2ec286f9c4a149a9cd4ac34b (diff)
downloaduGFX-ccde54722f2c284fb0e7fc273d65c57a3be71db1.tar.gz
uGFX-ccde54722f2c284fb0e7fc273d65c57a3be71db1.tar.bz2
uGFX-ccde54722f2c284fb0e7fc273d65c57a3be71db1.zip
Added ability to compile ugfx as a single file (excluding driver and board files).
Simply compile src/gfx_mk.c
Diffstat (limited to 'src/gdisp/fonts')
-rw-r--r--src/gdisp/fonts/build_fonts.sh2
-rw-r--r--src/gdisp/fonts/fonts.h2
-rw-r--r--src/gdisp/fonts/mf_bwfont.h15
-rw-r--r--src/gdisp/fonts/mf_rlefont.h15
-rw-r--r--src/gdisp/fonts/mf_scaledfont.h15
5 files changed, 47 insertions, 2 deletions
diff --git a/src/gdisp/fonts/build_fonts.sh b/src/gdisp/fonts/build_fonts.sh
index 22f95a91..8c10cfe6 100644
--- a/src/gdisp/fonts/build_fonts.sh
+++ b/src/gdisp/fonts/build_fonts.sh
@@ -65,7 +65,7 @@ build fixed_10x20.bdf fixed_10x20 bwfont
build fixed_7x14.bdf fixed_7x14 bwfont
build fixed_5x8.bdf fixed_5x8 bwfont
-echo '#include "gfx.h"' > fonts.h
+echo '// This file is generated by build_fonts.sh' > fonts.h
for file in *.c; do
echo >> fonts.h
noext="${file%.*}"
diff --git a/src/gdisp/fonts/fonts.h b/src/gdisp/fonts/fonts.h
index 13904267..25ecde33 100644
--- a/src/gdisp/fonts/fonts.h
+++ b/src/gdisp/fonts/fonts.h
@@ -1,4 +1,4 @@
-#include "gfx.h"
+// This file is generated by build_fonts.sh
#if defined(GDISP_INCLUDE_FONT_DEJAVUSANS10) && GDISP_INCLUDE_FONT_DEJAVUSANS10
#define GDISP_FONT_FOUND
diff --git a/src/gdisp/fonts/mf_bwfont.h b/src/gdisp/fonts/mf_bwfont.h
new file mode 100644
index 00000000..df0e071b
--- /dev/null
+++ b/src/gdisp/fonts/mf_bwfont.h
@@ -0,0 +1,15 @@
+/*
+ * This file is subject to the terms of the GFX License. If a copy of
+ * the license was not distributed with this file, you can obtain one at:
+ *
+ * http://ugfx.org/license.html
+ */
+
+/* This is a stub file to prevent having to include the mcufont
+ * directory in the include path for funny compilers such as arduino
+ * which don't support a user specified include path.
+ *
+ * It is not needed anyway as the files are already included.
+ *
+ * New versions of the font generator do not generate these include lines.
+ */
diff --git a/src/gdisp/fonts/mf_rlefont.h b/src/gdisp/fonts/mf_rlefont.h
new file mode 100644
index 00000000..df0e071b
--- /dev/null
+++ b/src/gdisp/fonts/mf_rlefont.h
@@ -0,0 +1,15 @@
+/*
+ * This file is subject to the terms of the GFX License. If a copy of
+ * the license was not distributed with this file, you can obtain one at:
+ *
+ * http://ugfx.org/license.html
+ */
+
+/* This is a stub file to prevent having to include the mcufont
+ * directory in the include path for funny compilers such as arduino
+ * which don't support a user specified include path.
+ *
+ * It is not needed anyway as the files are already included.
+ *
+ * New versions of the font generator do not generate these include lines.
+ */
diff --git a/src/gdisp/fonts/mf_scaledfont.h b/src/gdisp/fonts/mf_scaledfont.h
new file mode 100644
index 00000000..df0e071b
--- /dev/null
+++ b/src/gdisp/fonts/mf_scaledfont.h
@@ -0,0 +1,15 @@
+/*
+ * This file is subject to the terms of the GFX License. If a copy of
+ * the license was not distributed with this file, you can obtain one at:
+ *
+ * http://ugfx.org/license.html
+ */
+
+/* This is a stub file to prevent having to include the mcufont
+ * directory in the include path for funny compilers such as arduino
+ * which don't support a user specified include path.
+ *
+ * It is not needed anyway as the files are already included.
+ *
+ * New versions of the font generator do not generate these include lines.
+ */