meson: minor subproject cleanup, update gitignore

This commit is contained in:
Ryan Lucia 2020-11-15 15:59:26 -05:00
parent f91f6f0743
commit cd0eee968f
3 changed files with 21 additions and 13 deletions

29
.gitignore vendored
View file

@ -2,7 +2,6 @@
packages/desktop/aegisub.desktop packages/desktop/aegisub.desktop
packages/desktop/aegisub.desktop.template packages/desktop/aegisub.desktop.template
packages/win_installer/vendor
src/libresrc/bitmap.cpp src/libresrc/bitmap.cpp
src/libresrc/bitmap.h src/libresrc/bitmap.h
src/libresrc/default_config.cpp src/libresrc/default_config.cpp
@ -26,15 +25,21 @@ tools/repack-thes-dict.dSYM
# Meson # Meson
build*/ build*/
subprojects/freetype* subprojects/boost*/
subprojects/fribidi subprojects/cairo*
subprojects/harfbuzz
subprojects/libass
subprojects/libpng*
subprojects/packagecache
subprojects/zlib*
subprojects/libass
subprojects/icu
subprojects/ffmpeg subprojects/ffmpeg
subprojects/ffms2* subprojects/ffms2-*
subprojects/boost* 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-*

View file

@ -2,3 +2,6 @@
directory = harfbuzz directory = harfbuzz
url = https://github.com/harfbuzz/harfbuzz url = https://github.com/harfbuzz/harfbuzz
revision = master revision = master
[provide]
harfbuzz = libharfbuzz_dep

View file

@ -1,5 +1,5 @@
project('iconv', 'c', license: 'LGPL', project('iconv', 'c', license: 'LGPL',
meson_version: '>=0.49.0') meson_version: '>=0.54.0')
iconv_src = [ iconv_src = [
'libcharset/localcharset.c', 'libcharset/localcharset.c',