From c947ac005a14e9421fd07d9b4d178406aeff61d8 Mon Sep 17 00:00:00 2001 From: rsx Date: Mon, 24 Jun 2024 17:06:10 +0200 Subject: [PATCH] enable HAVE_FREETYPE when freetype feature is set --- .gitmodules | 3 +++ harfbuzz-sys/build.rs | 5 +++++ harfbuzz-sys/freetype-sys | 1 + 3 files changed, 9 insertions(+) create mode 160000 harfbuzz-sys/freetype-sys diff --git a/.gitmodules b/.gitmodules index d7458390..167565ec 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "harfbuzz-sys/harfbuzz"] path = harfbuzz-sys/harfbuzz url = https://github.com/harfbuzz/harfbuzz +[submodule "harfbuzz-sys/freetype-sys"] + path = harfbuzz-sys/freetype-sys + url = https://github.com/PistonDevelopers/freetype-sys diff --git a/harfbuzz-sys/build.rs b/harfbuzz-sys/build.rs index 4284150c..596d4edd 100644 --- a/harfbuzz-sys/build.rs +++ b/harfbuzz-sys/build.rs @@ -17,8 +17,13 @@ fn build_harfbuzz() { cfg.cpp(true) .flag_if_supported("-std=c++11") // for unix .warnings(false) + .include("freetype-sys/freetype2/include/") .file("harfbuzz/src/harfbuzz.cc"); + if cfg!(feature = "freetype") { + cfg.define("HAVE_FREETYPE", "1"); + } + if !target.contains("windows") { cfg.define("HAVE_PTHREAD", "1"); } diff --git a/harfbuzz-sys/freetype-sys b/harfbuzz-sys/freetype-sys new file mode 160000 index 00000000..074be10b --- /dev/null +++ b/harfbuzz-sys/freetype-sys @@ -0,0 +1 @@ +Subproject commit 074be10bf79f4fe2a038ccb10300612a40a78004