force icu subproject build on macos

This commit is contained in:
odrling 2020-11-27 23:17:33 +01:00
parent 3ff5fd3b49
commit 1666e803be
2 changed files with 9 additions and 6 deletions

View File

@ -11,12 +11,9 @@ jobs:
- name: Install dependencies
run: |
brew install meson ninja libass wxmac icu4c ffms2 boost glib
brew install meson ninja libass wxmac ffms2 glib
- name: Build Aegisub
run: |
export LDFLAGS="-L/usr/local/opt/icu4c/lib"
export CPPFLAGS="-I/usr/local/opt/icu4c/include"
export PKG_CONFIG_PATH="/usr/local/opt/icu4c/lib/pkgconfig"
meson builddir -Ddefault_library=static
ninja -C builddir

View File

@ -207,8 +207,14 @@ endif
conf.set('UNICODE', '1')
conf.set('_UNICODE', '1')
deps += dependency('icu-uc', version: '>=4.8.1.1')
deps += dependency('icu-i18n', version: '>=4.8.1.1')
if host_machine.system() == 'darwin'
# force build icu subproject
deps += dependency('icu-uc', version: '>=4.8.1.1', method: 'config-tool')
deps += dependency('icu-i18n', version: '>=4.8.1.1', method: 'config-tool')
else
deps += dependency('icu-uc', version: '>=4.8.1.1')
deps += dependency('icu-i18n', version: '>=4.8.1.1')
endif
dep_avail = []
foreach dep: [