meson: attempt to wrangle dependencies

This commit is contained in:
Ryan Lucia 2019-07-21 15:14:26 -04:00
parent 7befd5e759
commit 5e14a9265b
3 changed files with 33 additions and 11 deletions

View File

@ -49,15 +49,35 @@ if not iconv_dep.found() and host_machine.system() == 'windows'
endif endif
deps += iconv_dep deps += iconv_dep
deps += dependency('libass', version: '>=0.9.7') deps += dependency('libass', version: '>=0.9.7',
fallback: ['libass', 'libass_dep'])
deps += dependency('boost', version: '>=1.50.0', deps += dependency('boost', version: '>=1.50.0',
modules: ['chrono', 'filesystem', 'locale', 'regex', modules: ['chrono', 'filesystem', 'locale', 'regex',
'system', 'thread']) 'system', 'thread'])
deps += dependency('zlib') deps += dependency('zlib', fallback: ['zlib', 'zlib_dep'])
icu_uc_dep = dependency('icu-uc', version: '>=4.8.1.1') # TODO: overhaul all this to properly handle windows vs non-windows
wx_dep = dependency('wxWidgets', version: '>=3.0.0', required: false,
modules: ['std', 'stc', 'gl'])
if not wx_dep.found()
deps_inc += include_directories(get_option('wx_path') / 'include' / 'msvc', get_option('wx_path') / 'include')
add_project_arguments('-DUNICODE', '-D_UNICODE', language: 'cpp')
add_project_arguments('-DwxMSVC_VERSION_AUTO', '-DWXUSINGDLL', language: 'cpp')
endif
deps += wx_dep
icu_uc_dep = dependency('icu-uc', version: '>=4.8.1.1', required: false)
icu_i18n_dep = dependency('icu-i18n', version: '>=4.8.1.1', required: false)
if not (icu_uc_dep.found() and icu_i18n_dep.found())
deps_inc += include_directories(get_option('icu_path') / 'include')
endif
if not icu_uc_dep.found() # check for non-empty, only work with windows, etc
icu_uc_dep = cxx.find_library('icuuc', dirs: get_option('icu_path') / 'lib64')
endif
deps += icu_uc_dep deps += icu_uc_dep
icu_i18n_dep = dependency('icu-i18n', version: '>=4.8.1.1') if not icu_i18n_dep.found()
icu_i18n_dep = cxx.find_library('icuin', dirs: get_option('icu_path') / 'lib64')
endif
deps += icu_i18n_dep deps += icu_i18n_dep
dep_avail = [] dep_avail = []
@ -68,11 +88,11 @@ foreach dep: [
['portaudio-2.0', '', 'PortAudio'], ['portaudio-2.0', '', 'PortAudio'],
['openal', '>=0.0.8', 'OpenAL'], ['openal', '>=0.0.8', 'OpenAL'],
# video # video
['ffms2', '', 'FFMS2'], ['ffms2', '', 'FFMS2'], # needs a proper port
# other # other
['fftw3', '', 'FFTW3'], ['fftw3', '', 'FFTW3'],
['hunspell', '', 'Hunspell'], ['hunspell', '', 'Hunspell'], # needs a proper port
['uchardet', '', 'uchardet'], ['uchardet', '', 'uchardet'], # needs a proper port
] ]
d = dependency(dep[0], version: dep[1] != '' ? dep[1]: '>=0', d = dependency(dep[0], version: dep[1] != '' ? dep[1]: '>=0',
required: false) required: false)
@ -152,9 +172,6 @@ else
endif endif
subdir('vendor/luabins/src') subdir('vendor/luabins/src')
deps += dependency('wxWidgets', version: '>=3.0.0',
modules: ['std', 'stc', 'gl'])
dep_gl = dependency('gl', required: false) dep_gl = dependency('gl', required: false)
if not dep_gl.found() if not dep_gl.found()
if host_machine.system() == 'windows' if host_machine.system() == 'windows'
@ -174,6 +191,8 @@ endif
deps += dep_gl deps += dep_gl
# sort out csri
acconf = configure_file(output: 'acconf.h', configuration: conf) acconf = configure_file(output: 'acconf.h', configuration: conf)
subdir('automation') subdir('automation')

View File

@ -13,6 +13,9 @@ option('uchardet', type: 'feature', description: 'uchardet character encoding de
option('system_luajit', type: 'boolean', value: false, description: 'Force using system luajit') option('system_luajit', type: 'boolean', value: false, description: 'Force using system luajit')
option('icu_path', type: 'string', value: '', description: 'Path to ICU libraries on Windows')
option('wx_path', type: 'string', value: '', description: 'Path to wxWidgets libraries on Windows')
option('credit', type: 'string', value: '', description: 'Build credit shown in program title') 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('enable_update_checker', type: 'boolean', value: false, description: 'Enable the update checker')

View File

@ -49,7 +49,7 @@
#endif #endif
#ifndef _WIN32 #ifndef _WIN32
#include "../acconf.h" #include "../../acconf.h"
#endif #endif
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN