diff --git a/modules/text_server_adv/text_server_adv.cpp b/modules/text_server_adv/text_server_adv.cpp index 79c007ace65b..435b93cc7e14 100644 --- a/modules/text_server_adv/text_server_adv.cpp +++ b/modules/text_server_adv/text_server_adv.cpp @@ -73,8 +73,10 @@ using namespace godot; #endif #ifdef MODULE_SVG_ENABLED +#ifdef MODULE_FREETYPE_ENABLED #include "thorvg_svg_in_ot.h" #endif +#endif /*************************************************************************/ /* bmp_font_t HarfBuzz Bitmap font interface */ diff --git a/modules/text_server_adv/thorvg_svg_in_ot.cpp b/modules/text_server_adv/thorvg_svg_in_ot.cpp index 1406e3aaa0b4..08e92c8ce920 100644 --- a/modules/text_server_adv/thorvg_svg_in_ot.cpp +++ b/modules/text_server_adv/thorvg_svg_in_ot.cpp @@ -49,10 +49,11 @@ using namespace godot; #include "core/typedefs.h" #include "core/variant/variant.h" -#include "modules/modules_enabled.gen.h" // For svg. +#include "modules/modules_enabled.gen.h" // For svg, freetype. #endif #ifdef MODULE_SVG_ENABLED +#ifdef MODULE_FREETYPE_ENABLED #include "thorvg_bounds_iterator.h" #include "thorvg_svg_in_ot.h" @@ -284,4 +285,5 @@ SVG_RendererHooks *get_tvg_svg_in_ot_hooks() { return &tvg_svg_in_ot_hooks; } +#endif // MODULE_FREETYPE_ENABLED #endif // MODULE_SVG_ENABLED diff --git a/modules/text_server_adv/thorvg_svg_in_ot.h b/modules/text_server_adv/thorvg_svg_in_ot.h index 4035a984b60b..95ba29a20de1 100644 --- a/modules/text_server_adv/thorvg_svg_in_ot.h +++ b/modules/text_server_adv/thorvg_svg_in_ot.h @@ -47,10 +47,11 @@ using namespace godot; #include "core/templates/hash_map.h" #include "core/typedefs.h" -#include "modules/modules_enabled.gen.h" // For svg. +#include "modules/modules_enabled.gen.h" // For svg, freetype. #endif #ifdef MODULE_SVG_ENABLED +#ifdef MODULE_FREETYPE_ENABLED #include #include @@ -81,6 +82,7 @@ FT_Error tvg_svg_in_ot_render(FT_GlyphSlot p_slot, FT_Pointer *p_state); SVG_RendererHooks *get_tvg_svg_in_ot_hooks(); +#endif // MODULE_FREETYPE_ENABLED #endif // MODULE_SVG_ENABLED #endif // THORVG_SVG_IN_OT_H diff --git a/modules/text_server_fb/text_server_fb.cpp b/modules/text_server_fb/text_server_fb.cpp index 9a9dcb3a31c0..b443b258db5a 100644 --- a/modules/text_server_fb/text_server_fb.cpp +++ b/modules/text_server_fb/text_server_fb.cpp @@ -66,8 +66,10 @@ using namespace godot; #endif #ifdef MODULE_SVG_ENABLED +#ifdef MODULE_FREETYPE_ENABLED #include "thorvg_svg_in_ot.h" #endif +#endif /*************************************************************************/ diff --git a/modules/text_server_fb/thorvg_svg_in_ot.cpp b/modules/text_server_fb/thorvg_svg_in_ot.cpp index 1406e3aaa0b4..a646d904be5e 100644 --- a/modules/text_server_fb/thorvg_svg_in_ot.cpp +++ b/modules/text_server_fb/thorvg_svg_in_ot.cpp @@ -53,6 +53,7 @@ using namespace godot; #endif #ifdef MODULE_SVG_ENABLED +#ifdef MODULE_FREETYPE_ENABLED #include "thorvg_bounds_iterator.h" #include "thorvg_svg_in_ot.h" @@ -284,4 +285,5 @@ SVG_RendererHooks *get_tvg_svg_in_ot_hooks() { return &tvg_svg_in_ot_hooks; } +#endif // MODULE_FREETYPE_ENABLED #endif // MODULE_SVG_ENABLED diff --git a/modules/text_server_fb/thorvg_svg_in_ot.h b/modules/text_server_fb/thorvg_svg_in_ot.h index 4035a984b60b..95ba29a20de1 100644 --- a/modules/text_server_fb/thorvg_svg_in_ot.h +++ b/modules/text_server_fb/thorvg_svg_in_ot.h @@ -47,10 +47,11 @@ using namespace godot; #include "core/templates/hash_map.h" #include "core/typedefs.h" -#include "modules/modules_enabled.gen.h" // For svg. +#include "modules/modules_enabled.gen.h" // For svg, freetype. #endif #ifdef MODULE_SVG_ENABLED +#ifdef MODULE_FREETYPE_ENABLED #include #include @@ -81,6 +82,7 @@ FT_Error tvg_svg_in_ot_render(FT_GlyphSlot p_slot, FT_Pointer *p_state); SVG_RendererHooks *get_tvg_svg_in_ot_hooks(); +#endif // MODULE_FREETYPE_ENABLED #endif // MODULE_SVG_ENABLED #endif // THORVG_SVG_IN_OT_H