iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

meson: don't build fontconfig file lister on windows

This commit is contained in:
line0 2019-10-27 02:23:40 +01:00 committed by Ryan Lucia
parent b8e2cf83fd
commit b6c0f2d544
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meson.build
View File

@ -33,12 +33,14 @@ conf.set('WITH_UPDATE_CHECKER', get_option('enable_update_checker'))
deps = [] deps = []
deps_inc = [] deps_inc = []
conf.set('WITH_FONTCONFIG', '0')
if host_machine.system() == 'darwin' if host_machine.system() == 'darwin'
add_languages('objc', 'objcpp') add_languages('objc', 'objcpp')
add_project_arguments('-DGL_SILENCE_DEPRECATION', language: 'cpp') add_project_arguments('-DGL_SILENCE_DEPRECATION', language: 'cpp')
# meson does not currently support objcpp_std # meson does not currently support objcpp_std
add_project_arguments('-std=c++11', language: 'objcpp') add_project_arguments('-std=c++11', language: 'objcpp')
elif host_machine.system() != 'windows' elif host_machine.system() != 'windows'
conf.set('WITH_FONTCONFIG', '1')
deps += dependency('fontconfig') deps += dependency('fontconfig')
endif endif

2
src/meson.build
View File

@ -171,7 +171,7 @@ if host_machine.system() == 'darwin'
'osx/retina_helper.mm', 'osx/retina_helper.mm',
'osx/scintilla_ime.mm', 'osx/scintilla_ime.mm',
] ]
else elif conf.get('WITH_FONTCONFIG') == '1'
aegisub_src += 'font_file_lister_fontconfig.cpp' aegisub_src += 'font_file_lister_fontconfig.cpp'
endif endif