From 2a8f09bb045674415f59ae22abd138d8ebafd7b0 Mon Sep 17 00:00:00 2001 From: CommanderRedYT Date: Sun, 29 Jan 2023 17:35:05 +0100 Subject: [PATCH] Added ifdefs for non-gfx-font projects --- src/Fonts/GFXFF/TomThumb.cpp | 5 +++++ src/Fonts/GFXFF/TomThumb.h | 5 +++++ src/din1451alt10pt8b.cpp | 4 ++++ src/din1451alt10pt8b.h | 5 +++++ 4 files changed, 19 insertions(+) diff --git a/src/Fonts/GFXFF/TomThumb.cpp b/src/Fonts/GFXFF/TomThumb.cpp index fffdc5a..80b6273 100644 --- a/src/Fonts/GFXFF/TomThumb.cpp +++ b/src/Fonts/GFXFF/TomThumb.cpp @@ -1,5 +1,9 @@ #include "TomThumb.h" +#include "sdkconfig.h" + +#ifdef CONFIG_TFT_LOAD_GFXFF + namespace espgui { #define TOMTHUMB_USE_EXTENDED 0 @@ -430,3 +434,4 @@ const GFXfont TomThumb { 0x20, 0x7E, 6 }; } // namespace espgui +#endif diff --git a/src/Fonts/GFXFF/TomThumb.h b/src/Fonts/GFXFF/TomThumb.h index 78ce079..b788869 100644 --- a/src/Fonts/GFXFF/TomThumb.h +++ b/src/Fonts/GFXFF/TomThumb.h @@ -48,6 +48,10 @@ #pragma once +#include "sdkconfig.h" + +#ifdef CONFIG_TFT_LOAD_GFXFF + // system includes #include @@ -63,3 +67,4 @@ extern const GFXglyph TomThumbGlyphs[]; extern const GFXfont TomThumb; } // namespace espgui +#endif diff --git a/src/din1451alt10pt8b.cpp b/src/din1451alt10pt8b.cpp index 5370b92..9049b4d 100644 --- a/src/din1451alt10pt8b.cpp +++ b/src/din1451alt10pt8b.cpp @@ -1,5 +1,8 @@ #include "din1451alt10pt8b.h" +#include "sdkconfig.h" + +#ifdef CONFIG_TFT_LOAD_GFXFF namespace espgui { const uint8_t din1451alt10pt8bBitmaps[] = { @@ -461,3 +464,4 @@ const GFXfont din1451alt10pt8b { // Approx. 4245 bytes } // namespace espgui +#endif diff --git a/src/din1451alt10pt8b.h b/src/din1451alt10pt8b.h index f7cbaf7..b9a56d0 100644 --- a/src/din1451alt10pt8b.h +++ b/src/din1451alt10pt8b.h @@ -1,5 +1,9 @@ #pragma once +#include "sdkconfig.h" + +#ifdef CONFIG_TFT_LOAD_GFXFF + // system includes #include @@ -15,3 +19,4 @@ extern const GFXglyph din1451alt10pt8bGlyphs[]; extern const GFXfont din1451alt10pt8b; } // namespace espgui +#endif -- 2.50.1