Manual merge of into .

This commit is contained in:
Adam Harrison
2021-11-23 15:57:22 -05:00
44 changed files with 2789 additions and 311 deletions
+5 -5
View File
@@ -1,6 +1,6 @@
project('lite-xl',
['c'],
version : '2.0.2',
version : '2.0.3',
license : 'MIT',
meson_version : '>= 0.54',
default_options : ['c_std=gnu11']
@@ -23,6 +23,7 @@ endif
cc = meson.get_compiler('c')
lite_includes = []
lite_cargs = []
# On macos we need to use the SDL renderer to support retina displays
if get_option('renderer') or host_machine.system() == 'darwin'
@@ -45,6 +46,7 @@ endif
if not get_option('source-only')
libm = cc.find_library('m', required : false)
libdl = cc.find_library('dl', required : false)
threads_dep = dependency('threads')
lua_dep = dependency('lua5.2', fallback: ['lua', 'lua_dep'],
default_options: ['shared=false', 'use_readline=false', 'app=false']
)
@@ -58,7 +60,7 @@ if not get_option('source-only')
]
)
lite_deps = [lua_dep, sdl_dep, reproc_dep, pcre2_dep, libm, libdl, freetype_dep]
lite_deps = [lua_dep, sdl_dep, reproc_dep, pcre2_dep, libm, libdl, freetype_dep, threads_dep]
if host_machine.system() == 'windows'
# Note that we need to explicitly add the windows socket DLL because
@@ -118,10 +120,8 @@ configure_file(
install_dir : lite_datadir / 'core',
)
#===============================================================================
# Targets
#===============================================================================
if not get_option('source-only')
subdir('lib/dmon')
subdir('src')
subdir('scripts')
endif