diff options
| author | inmarket <andrewh@inmarket.com.au> | 2013-07-29 16:31:54 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2013-07-29 16:31:54 +1000 |
| commit | 7f15192fe8a4fea1ff9cdd031aebf4001c523cbb (patch) | |
| tree | d310f76823750968b9f4024f517cebbfb015a335 /src | |
| parent | 7c303eb72efe8a61383c4914fb940024236b2bdb (diff) | |
| download | uGFX-7f15192fe8a4fea1ff9cdd031aebf4001c523cbb.tar.gz uGFX-7f15192fe8a4fea1ff9cdd031aebf4001c523cbb.tar.bz2 uGFX-7f15192fe8a4fea1ff9cdd031aebf4001c523cbb.zip | |
Fix rule handling to help the end user get things right.
Tidied up anti-alias where the hardware does not support pixel read-back.
Diffstat (limited to 'src')
| -rw-r--r-- | src/gdisp/fonts/build_fonts.sh | 5 | ||||
| -rw-r--r-- | src/gdisp/fonts/fonts.h | 19 |
2 files changed, 23 insertions, 1 deletions
diff --git a/src/gdisp/fonts/build_fonts.sh b/src/gdisp/fonts/build_fonts.sh index 8b434e6e..b02dd22a 100644 --- a/src/gdisp/fonts/build_fonts.sh +++ b/src/gdisp/fonts/build_fonts.sh @@ -71,7 +71,10 @@ for file in *.c; do upper=${noext^^} defname='GDISP_INCLUDE_FONT_'$upper echo '#if defined('$defname') && '$defname >> fonts.h + echo '#define GDISP_FONT_FOUND' >> fonts.h echo '#include "'$file'"' >> fonts.h echo '#endif' >> fonts.h done - +echo '#ifndef GDISP_FONT_FOUND' >> fonts.h +echo '#error "GDISP: No fonts have been included"' >> fonts.h +echo '#endif' >> fonts.h diff --git a/src/gdisp/fonts/fonts.h b/src/gdisp/fonts/fonts.h index 3b67de84..d0dd6c5b 100644 --- a/src/gdisp/fonts/fonts.h +++ b/src/gdisp/fonts/fonts.h @@ -2,61 +2,80 @@ #include <gfx.h> #if defined(GDISP_INCLUDE_FONT_DEJAVUSANS10) && GDISP_INCLUDE_FONT_DEJAVUSANS10 +#define GDISP_FONT_FOUND #include "DejaVuSans10.c" #endif #if defined(GDISP_INCLUDE_FONT_DEJAVUSANS12_AA) && GDISP_INCLUDE_FONT_DEJAVUSANS12_AA +#define GDISP_FONT_FOUND #include "DejaVuSans12_aa.c" #endif #if defined(GDISP_INCLUDE_FONT_DEJAVUSANS12) && GDISP_INCLUDE_FONT_DEJAVUSANS12 +#define GDISP_FONT_FOUND #include "DejaVuSans12.c" #endif #if defined(GDISP_INCLUDE_FONT_DEJAVUSANS16_AA) && GDISP_INCLUDE_FONT_DEJAVUSANS16_AA +#define GDISP_FONT_FOUND #include "DejaVuSans16_aa.c" #endif #if defined(GDISP_INCLUDE_FONT_DEJAVUSANS16) && GDISP_INCLUDE_FONT_DEJAVUSANS16 +#define GDISP_FONT_FOUND #include "DejaVuSans16.c" #endif #if defined(GDISP_INCLUDE_FONT_DEJAVUSANS24_AA) && GDISP_INCLUDE_FONT_DEJAVUSANS24_AA +#define GDISP_FONT_FOUND #include "DejaVuSans24_aa.c" #endif #if defined(GDISP_INCLUDE_FONT_DEJAVUSANS24) && GDISP_INCLUDE_FONT_DEJAVUSANS24 +#define GDISP_FONT_FOUND #include "DejaVuSans24.c" #endif #if defined(GDISP_INCLUDE_FONT_DEJAVUSANS32_AA) && GDISP_INCLUDE_FONT_DEJAVUSANS32_AA +#define GDISP_FONT_FOUND #include "DejaVuSans32_aa.c" #endif #if defined(GDISP_INCLUDE_FONT_DEJAVUSANS32) && GDISP_INCLUDE_FONT_DEJAVUSANS32 +#define GDISP_FONT_FOUND #include "DejaVuSans32.c" #endif #if defined(GDISP_INCLUDE_FONT_DEJAVUSANSBOLD12_AA) && GDISP_INCLUDE_FONT_DEJAVUSANSBOLD12_AA +#define GDISP_FONT_FOUND #include "DejaVuSansBold12_aa.c" #endif #if defined(GDISP_INCLUDE_FONT_DEJAVUSANSBOLD12) && GDISP_INCLUDE_FONT_DEJAVUSANSBOLD12 +#define GDISP_FONT_FOUND #include "DejaVuSansBold12.c" #endif #if defined(GDISP_INCLUDE_FONT_FIXED_10X20) && GDISP_INCLUDE_FONT_FIXED_10X20 +#define GDISP_FONT_FOUND #include "fixed_10x20.c" #endif #if defined(GDISP_INCLUDE_FONT_FIXED_5X8) && GDISP_INCLUDE_FONT_FIXED_5X8 +#define GDISP_FONT_FOUND #include "fixed_5x8.c" #endif #if defined(GDISP_INCLUDE_FONT_FIXED_7X14) && GDISP_INCLUDE_FONT_FIXED_7X14 +#define GDISP_FONT_FOUND #include "fixed_7x14.c" #endif #if defined(GDISP_INCLUDE_FONT_LARGENUMBERS) && GDISP_INCLUDE_FONT_LARGENUMBERS +#define GDISP_FONT_FOUND #include "LargeNumbers.c" #endif + +#ifndef GDISP_FONT_FOUND +#error "GDISP: No fonts have been included" +#endif |