Skip to content

Commit

Permalink
Change #include to not... include... harfbuzz or fribidi folder
Browse files Browse the repository at this point in the history
From ice0 comment on PR synfig#2424:

 For example, currently we are using #include <harfbuzz/hb.h> instead of <hb.h>
 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 synfig#2442:

 Please remove prefix from `fribidi` too.

```
pkg-config --cflags fribidi
-I/usr/include/fribidi
```
  • Loading branch information
rodolforg committed Nov 23, 2021
1 parent 83828f0 commit 9a5cea4
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions synfig-core/src/modules/lyr_freetype/lyr_freetype.cpp
Expand Up @@ -46,8 +46,8 @@
#include <glibmm.h>

#if HAVE_HARFBUZZ
#include <fribidi/fribidi.h>
#include <harfbuzz/hb-ft.h>
#include <fribidi.h>
#include <hb-ft.h>
#endif

#include <synfig/canvasfilenaming.h>
Expand Down
2 changes: 1 addition & 1 deletion synfig-core/src/modules/lyr_freetype/lyr_freetype.h
Expand Up @@ -39,7 +39,7 @@
#include FT_GLYPH_H

#if HAVE_HARFBUZZ
#include <harfbuzz/hb.h>
#include <hb.h>
#endif

/* === M A C R O S ========================================================= */
Expand Down

0 comments on commit 9a5cea4

Please sign in to comment.