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

[meson] fix update checker

This commit is contained in:
odrling 2019-11-27 02:23:29 +01:00
parent 3b97278982
commit cf05a92568
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
meson.build
View File

@ -3,7 +3,7 @@ project('Aegisub', ['c', 'cpp'],
meson_version: '>=0.50.0',
# c_std=c11 should be here but it breaks Linux builds for some reason, needs investigation
default_options: ['cpp_std=c++11', 'b_lto=true'],
version: '3.2.2')
version: '3.3.2-2')
if host_machine.system() == 'windows'
version_sh = find_program('tools/version.ps1')
@ -42,6 +42,8 @@ if get_option('credit') != ''
conf.set_quoted('BUILD_CREDIT', get_option('credit'))
endif
conf.set('WITH_UPDATE_CHECKER', get_option('enable_update_checker'))
conf.set_quoted('UPDATE_CHECKER_SERVER', get_option('update_server'))
conf.set_quoted('UPDATE_CHECKER_BASE_URL', get_option('update_url'))
deps = []
deps_inc = []
@ -69,9 +71,18 @@ deps += iconv_dep
deps += dependency('libass', version: '>=0.9.7',
fallback: ['libass', 'libass_dep'])
deps += dependency('boost', version: '>=1.50.0',
modules: ['chrono', 'filesystem', 'locale', 'regex',
'system', 'thread'])
if get_option('enable_update_checker')
deps += dependency('boost', version: '>=1.66.0',
modules: ['chrono', 'filesystem', 'locale', 'regex',
'system', 'thread'])
deps += dependency('openssl')
else
deps += dependency('boost', version: '>=1.50.0',
modules: ['chrono', 'filesystem', 'locale', 'regex',
'system', 'thread'])
endif
deps += dependency('zlib', fallback: ['zlib', 'zlib_dep'])
wx_dep = dependency('wxWidgets', version: '>=3.0.0',
@ -225,9 +236,6 @@ endif
deps += dep_gl
ssl = dependency('openssl')
deps += ssl
# TODO: csri
acconf = configure_file(output: 'acconf.h', configuration: conf)

4
meson_options.txt
View File

@ -19,7 +19,7 @@ option('wx_path', type: 'string', value: '', description: 'Path to wxWidgets lib
option('credit', type: 'string', value: '', description: 'Build credit shown in program title')
option('enable_update_checker', type: 'boolean', value: false, description: 'Enable the update checker')
option('update_server', type: 'string', value: 'updates.aegisub.org', description: 'Server to use for the update checker')
option('update_url', type: 'string', value: '/trunk', description: 'Base path to use for the update checker')
option('update_server', type: 'string', value: 'mugen.karaokes.moe', description: 'Server to use for the update checker')
option('update_url', type: 'string', value: '/downloads/aegisub-japan7', description: 'Base path to use for the update checker')
option('build_osx_bundle', type: 'boolean', value: 'false', description: 'Package Aegisub.app on OSX')