Merge reproc changes from dev.
This commit is contained in:
+11
-2
@@ -10,13 +10,23 @@ libdl = cc.find_library('dl', required : false)
|
||||
libx11 = dependency('x11', required : false)
|
||||
lua_dep = dependency('lua5.2', required : false)
|
||||
pcre2_dep = dependency('libpcre2-8')
|
||||
sdl_dep = dependency('sdl2', method: 'config-tool')
|
||||
|
||||
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
|
||||
|
||||
sdl_dep = dependency('sdl2', method: 'config-tool')
|
||||
reproc_subproject = subproject('reproc', default_options: ['default_library=static', 'multithreaded=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, libx11]
|
||||
|
||||
if host_machine.system() == 'windows'
|
||||
# Note that we need to explicitly add the windows socket DLL because
|
||||
# the pkg-config file from reproc does not include it.
|
||||
lite_deps += meson.get_compiler('cpp').find_library('ws2_32', required: true)
|
||||
endif
|
||||
|
||||
lite_cargs = []
|
||||
if get_option('portable')
|
||||
@@ -55,4 +65,3 @@ endif
|
||||
|
||||
subdir('lib/font_renderer')
|
||||
subdir('src')
|
||||
|
||||
|
||||
Reference in New Issue
Block a user