From 9a5cea402a0139a43b2f753dee78ee2b2a6b8337 Mon Sep 17 00:00:00 2001 From: Rodolfo Ribeiro Gomes Date: Mon, 22 Nov 2021 23:07:49 -0300 Subject: [PATCH] Change #include to not... include... harfbuzz or fribidi folder From ice0 comment on PR #2424: For example, currently we are using #include instead of but pkg-config returns `harfbuzz/include/harfbuzz`, not just `harfbuzz/include`. This works fine on Linux because all system libraries is already included by compiler. This need to be fixed. (TODO) -- From ice0 comment on PR #2442: Please remove prefix from `fribidi` too. ``` pkg-config --cflags fribidi -I/usr/include/fribidi ``` --- synfig-core/src/modules/lyr_freetype/lyr_freetype.cpp | 4 ++-- synfig-core/src/modules/lyr_freetype/lyr_freetype.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/synfig-core/src/modules/lyr_freetype/lyr_freetype.cpp b/synfig-core/src/modules/lyr_freetype/lyr_freetype.cpp index ab73911249b..e78b44289b0 100644 --- a/synfig-core/src/modules/lyr_freetype/lyr_freetype.cpp +++ b/synfig-core/src/modules/lyr_freetype/lyr_freetype.cpp @@ -46,8 +46,8 @@ #include #if HAVE_HARFBUZZ -#include -#include +#include +#include #endif #include diff --git a/synfig-core/src/modules/lyr_freetype/lyr_freetype.h b/synfig-core/src/modules/lyr_freetype/lyr_freetype.h index 3aea7b32e16..0e3d99f16e3 100644 --- a/synfig-core/src/modules/lyr_freetype/lyr_freetype.h +++ b/synfig-core/src/modules/lyr_freetype/lyr_freetype.h @@ -39,7 +39,7 @@ #include FT_GLYPH_H #if HAVE_HARFBUZZ -#include +#include #endif /* === M A C R O S ========================================================= */