walkero
/
lite-xl
1
0
Fork 0
Code Issues 7 Pull Requests Projects Releases 14 Wiki Activity

use dependency fallbacks, use system reproc if available

This commit is contained in:
Jan200101 2021-08-23 19:10:13 +02:00 committed by Francesco Abbate
parent fb907c9bf4
commit fc4c7a29ee
2 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/font_renderer/meson.build
View File

@ -1,10 +1,6 @@
freetype_dep = dependency('freetype2') freetype_dep = dependency('freetype2')
libagg_dep = dependency('libagg', required: false) libagg_dep = dependency('libagg', fallback: ['libagg', 'libagg_dep'])
if not libagg_dep.found()
libagg_subproject = subproject('libagg')
libagg_dep = libagg_subproject.get_variable('libagg_dep')
endif
font_renderer_sources = [ font_renderer_sources = [
'agg_font_freetype.cpp', 'agg_font_freetype.cpp',

13
meson.build
View File

@ -51,24 +51,15 @@ endif
#=============================================================================== #===============================================================================
libm = cc.find_library('m', required : false) libm = cc.find_library('m', required : false)
libdl = cc.find_library('dl', required : false) libdl = cc.find_library('dl', required : false)
lua_dep = dependency('lua5.2', required : false) lua_dep = dependency('lua5.2', fallback: ['lua', 'lua_dep'])
pcre2_dep = dependency('libpcre2-8') pcre2_dep = dependency('libpcre2-8')
sdl_dep = dependency('sdl2', method: 'config-tool') sdl_dep = dependency('sdl2', method: 'config-tool')
reproc_dep = dependency('reproc', fallback: ['reproc', 'reproc_dep'],
if not lua_dep.found()
lua_subproject = subproject('lua',
default_options: ['shared=false', 'use_readline=false', 'app=false']
)
lua_dep = lua_subproject.get_variable('lua_dep')
endif
reproc_subproject = subproject('reproc',
default_options: [ default_options: [
'default_library=static', 'multithreaded=false', 'default_library=static', 'multithreaded=false',
'reproc-cpp=false', 'examples=false' 'reproc-cpp=false', 'examples=false'
] ]
) )
reproc_dep = reproc_subproject.get_variable('reproc_dep')
lite_deps = [lua_dep, sdl_dep, reproc_dep, pcre2_dep, libm, libdl] lite_deps = [lua_dep, sdl_dep, reproc_dep, pcre2_dep, libm, libdl]