From cd0eee968f961372335828dacce6e2338dfb500d Mon Sep 17 00:00:00 2001 From: Ryan Lucia Date: Sun, 15 Nov 2020 15:59:26 -0500 Subject: [PATCH] meson: minor subproject cleanup, update gitignore --- .gitignore | 29 +++++++++++++++++------------ subprojects/harfbuzz.wrap | 3 +++ subprojects/iconv/meson.build | 2 +- 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index b8181d675..854d4d565 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,6 @@ packages/desktop/aegisub.desktop packages/desktop/aegisub.desktop.template -packages/win_installer/vendor src/libresrc/bitmap.cpp src/libresrc/bitmap.h src/libresrc/default_config.cpp @@ -26,15 +25,21 @@ tools/repack-thes-dict.dSYM # Meson build*/ -subprojects/freetype* -subprojects/fribidi -subprojects/harfbuzz -subprojects/libass -subprojects/libpng* -subprojects/packagecache -subprojects/zlib* -subprojects/libass -subprojects/icu +subprojects/boost*/ +subprojects/cairo* subprojects/ffmpeg -subprojects/ffms2* -subprojects/boost* +subprojects/ffms2-* +subprojects/fontconfig* +subprojects/freetype2 +subprojects/fribidi +subprojects/glib* +subprojects/harfbuzz +subprojects/icu +subprojects/libass +subprojects/libffi* +subprojects/libpng-* +subprojects/nasm-* +subprojects/packagecache +subprojects/proxy-libintl* +subprojects/wxWidgets +subprojects/zlib-* diff --git a/subprojects/harfbuzz.wrap b/subprojects/harfbuzz.wrap index 3d320e894..08bfb0850 100644 --- a/subprojects/harfbuzz.wrap +++ b/subprojects/harfbuzz.wrap @@ -2,3 +2,6 @@ directory = harfbuzz url = https://github.com/harfbuzz/harfbuzz revision = master + +[provide] +harfbuzz = libharfbuzz_dep diff --git a/subprojects/iconv/meson.build b/subprojects/iconv/meson.build index 66cdc9806..458cd9d51 100644 --- a/subprojects/iconv/meson.build +++ b/subprojects/iconv/meson.build @@ -1,5 +1,5 @@ project('iconv', 'c', license: 'LGPL', - meson_version: '>=0.49.0') + meson_version: '>=0.54.0') iconv_src = [ 'libcharset/localcharset.c',