Move dmon files into lib/dmon

This commit is contained in:
Francesco Abbate 2021-10-08 22:10:17 +02:00
parent bba42adc73
commit a9f6f01ed0
5 changed files with 5 additions and 6 deletions

View File

@ -9,7 +9,7 @@ font_renderer_sources = [
font_renderer_cdefs = ['-DFONT_RENDERER_HEIGHT_HACK'] font_renderer_cdefs = ['-DFONT_RENDERER_HEIGHT_HACK']
font_renderer_include = include_directories('.') lite_includes += include_directories('.')
libfontrenderer = static_library('fontrenderer', libfontrenderer = static_library('fontrenderer',
font_renderer_sources, font_renderer_sources,

View File

@ -23,6 +23,7 @@ endif
cc = meson.get_compiler('c') cc = meson.get_compiler('c')
lite_includes = []
lite_cargs = [] lite_cargs = []
# On macos we need to use the SDL renderer to support retina displays # On macos we need to use the SDL renderer to support retina displays
if get_option('renderer') or host_machine.system() == 'darwin' if get_option('renderer') or host_machine.system() == 'darwin'
@ -118,11 +119,9 @@ configure_file(
install_dir : lite_datadir / 'core', install_dir : lite_datadir / 'core',
) )
#===============================================================================
# Targets
#===============================================================================
if not get_option('source-only') if not get_option('source-only')
subdir('lib/font_renderer') subdir('lib/font_renderer')
subdir('lib/dmon')
subdir('src') subdir('src')
subdir('scripts') subdir('scripts')
endif endif

View File

@ -22,11 +22,11 @@ elif host_machine.system() == 'darwin'
lite_sources += 'bundle_open.m' lite_sources += 'bundle_open.m'
endif endif
lite_include = include_directories('.') lite_includes += include_directories('.')
executable('lite-xl', executable('lite-xl',
lite_sources + lite_rc, lite_sources + lite_rc,
include_directories: [lite_include, font_renderer_include], include_directories: lite_includes,
dependencies: lite_deps, dependencies: lite_deps,
c_args: lite_cargs, c_args: lite_cargs,
objc_args: lite_cargs, objc_args: lite_cargs,