diff options
| author | Chun-wei Fan <fanchunwei@src.gnome.org> | 2022-06-16 10:32:02 +0800 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2022-07-04 11:17:20 -0400 |
| commit | 94e9d90870fd2141951996a1b58df28306b6109b (patch) | |
| tree | ff246bee5f5bfed5e418ba0ff89714428d11899d | |
| parent | 6024cb0d31cfdafd718210c77e75987ff2ee898a (diff) | |
| download | pango-94e9d90870fd2141951996a1b58df28306b6109b.tar.gz | |
build: Fix HarfBuzz fallback for Windows
In order to build with DirectWrite support, HarfBuzz must also be built
with DirectWrite support, which is disabled by default. Tell the
fallback build to look for DirectWrite and enabled it as a result-it
should be sufficiently present for Visual Studio with the Windows 8.0
SDK, and we are likely using a Windows 10 SDK since we require Visual
Studio 2015 or later for MSVC builds.
Remove the line in .gitlab-ci/test-msys2.sh that requests this support
since we are putting this in the main Meson build files.
| -rw-r--r-- | .gitlab-ci/test-msys2.sh | 2 | ||||
| -rw-r--r-- | meson.build | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci/test-msys2.sh b/.gitlab-ci/test-msys2.sh index 4c036155..cf8bd77a 100644 --- a/.gitlab-ci/test-msys2.sh +++ b/.gitlab-ci/test-msys2.sh @@ -22,7 +22,7 @@ pacman --noconfirm -S --needed \ mingw-w64-$MSYS2_ARCH-toolchain \ mingw-w64-$MSYS2_ARCH-cantarell-fonts -meson --buildtype debug --force-fallback-for harfbuzz -Dharfbuzz:directwrite=auto _build +meson --buildtype debug --force-fallback-for harfbuzz _build cd _build ninja diff --git a/meson.build b/meson.build index 92068d8c..addc1bff 100644 --- a/meson.build +++ b/meson.build @@ -278,7 +278,7 @@ harfbuzz_dep = dependency('harfbuzz', version: harfbuzz_req_version, required: true, fallback: ['harfbuzz', 'libharfbuzz_dep'], - default_options: ['coretext=enabled', 'werror=false', 'docs=disabled']) + default_options: ['coretext=enabled', 'directwrite=auto', 'werror=false', 'docs=disabled']) harfbuzz_gobj_dep = dependency('harfbuzz-gobject', version: harfbuzz_req_version, required: true, |