build: split off static parts from external parts in evas
this way we can use that list easily in the modules, and keep the list for later module building. Differential Revision: https://phab.enlightenment.org/D11897
This commit is contained in:
parent
f6d20e1f96
commit
e1ea935dae
|
@ -49,7 +49,8 @@ evas_vg_savers_file = ['eet', 'svg']
|
||||||
|
|
||||||
rel_evas_modules = join_paths('..', '..', '..', 'modules', 'evas', 'engines', 'software_generic')
|
rel_evas_modules = join_paths('..', '..', '..', 'modules', 'evas', 'engines', 'software_generic')
|
||||||
evas_deps = [eo, eet, eina, efl, emile, ector, ecore, draw, buildsystem]
|
evas_deps = [eo, eet, eina, efl, emile, ector, ecore, draw, buildsystem]
|
||||||
evas_ext_deps = [buildsystem_simple, intl, m, draw_simple, valgrind, libunibreak, lua, vg_common]
|
evas_ext_deps = []
|
||||||
|
evas_ext_none_static_deps = [buildsystem_simple, intl, m, draw_simple, valgrind, libunibreak, lua, vg_common]
|
||||||
|
|
||||||
pub_eo_file_target = []
|
pub_eo_file_target = []
|
||||||
priv_eo_files = []
|
priv_eo_files = []
|
||||||
|
@ -138,16 +139,16 @@ evas_src += files([
|
||||||
|
|
||||||
evas_src_opt = [ ]
|
evas_src_opt = [ ]
|
||||||
|
|
||||||
evas_ext_deps += dependency('freetype2')
|
evas_ext_none_static_deps += dependency('freetype2')
|
||||||
|
|
||||||
if (get_option('fontconfig'))
|
if (get_option('fontconfig'))
|
||||||
config_h.set('HAVE_FONTCONFIG', '1')
|
config_h.set('HAVE_FONTCONFIG', '1')
|
||||||
evas_ext_deps += dependency('fontconfig')
|
evas_ext_none_static_deps += dependency('fontconfig')
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if (get_option('fribidi'))
|
if (get_option('fribidi'))
|
||||||
config_h.set('HAVE_FRIBIDI', '1')
|
config_h.set('HAVE_FRIBIDI', '1')
|
||||||
evas_ext_deps += dependency('fribidi')
|
evas_ext_none_static_deps += dependency('fribidi')
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if (get_option('pixman'))
|
if (get_option('pixman'))
|
||||||
|
@ -155,16 +156,16 @@ if (get_option('pixman'))
|
||||||
foreach support : pixman_support
|
foreach support : pixman_support
|
||||||
config_h.set(support, '1')
|
config_h.set(support, '1')
|
||||||
endforeach
|
endforeach
|
||||||
evas_ext_deps += dependency('pixman-1')
|
evas_ext_none_static_deps += dependency('pixman-1')
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if (get_option('hyphen'))
|
if (get_option('hyphen'))
|
||||||
config_h.set('HAVE_HYPHEN', '1')
|
config_h.set('HAVE_HYPHEN', '1')
|
||||||
hyphen = dependency('hyphen', required : false)
|
hyphen = dependency('hyphen', required : false)
|
||||||
if hyphen.found() == false
|
if hyphen.found() == false
|
||||||
evas_ext_deps += cc.find_library('hyphen')
|
evas_ext_none_static_deps += cc.find_library('hyphen')
|
||||||
endif
|
endif
|
||||||
evas_ext_deps += hyphen
|
evas_ext_none_static_deps += hyphen
|
||||||
config_h.set_quoted('EVAS_DICTS_HYPHEN_DIR', get_option('dictionaries-hyphen-dir'))
|
config_h.set_quoted('EVAS_DICTS_HYPHEN_DIR', get_option('dictionaries-hyphen-dir'))
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
@ -180,12 +181,12 @@ subdir('vg')
|
||||||
gl_deps = []
|
gl_deps = []
|
||||||
|
|
||||||
if get_option('harfbuzz')
|
if get_option('harfbuzz')
|
||||||
evas_ext_deps += dependency('harfbuzz')
|
evas_ext_none_static_deps += dependency('harfbuzz')
|
||||||
config_h.set('HAVE_HARFBUZZ', '1')
|
config_h.set('HAVE_HARFBUZZ', '1')
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if get_option('wl')
|
if get_option('wl')
|
||||||
evas_ext_deps += wayland_protocol
|
evas_ext_none_static_deps += wayland_protocol
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
||||||
|
@ -210,7 +211,7 @@ if cpu_sse3 == true or cpu_neon == true and cpu_neon_intrinsics == false
|
||||||
evas_include_directories +
|
evas_include_directories +
|
||||||
[vg_common_inc_dir],
|
[vg_common_inc_dir],
|
||||||
c_args: native_arch_opt_c_args,
|
c_args: native_arch_opt_c_args,
|
||||||
dependencies: [eina, eo, ector, emile, evas_deps, evas_ext_deps],
|
dependencies: [eina, eo, ector, emile, evas_deps, evas_ext_none_static_deps],
|
||||||
)
|
)
|
||||||
evas_link += [ evas_opt ]
|
evas_link += [ evas_opt ]
|
||||||
endif
|
endif
|
||||||
|
@ -284,6 +285,8 @@ evas_ext_deps += declare_dependency(
|
||||||
link_with: evas_link,
|
link_with: evas_link,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
evas_ext_deps += evas_ext_none_static_deps
|
||||||
|
|
||||||
evas_lib = library('evas',
|
evas_lib = library('evas',
|
||||||
include_directories: evas_include_directories + [vg_common_inc_dir],
|
include_directories: evas_include_directories + [vg_common_inc_dir],
|
||||||
sources : [evas_src, pub_eo_file_target, priv_eo_file_target],
|
sources : [evas_src, pub_eo_file_target, priv_eo_file_target],
|
||||||
|
|
|
@ -46,7 +46,7 @@ foreach engine_conf : engines
|
||||||
if build
|
if build
|
||||||
engine_include_dir = []
|
engine_include_dir = []
|
||||||
engine_src = []
|
engine_src = []
|
||||||
engine_deps = [eina, evas, evas_ext_deps]
|
engine_deps = [eina, evas, evas_ext_none_static_deps, eet]
|
||||||
engine_dep = declare_dependency(
|
engine_dep = declare_dependency(
|
||||||
include_directories: include_directories(engine),
|
include_directories: include_directories(engine),
|
||||||
)
|
)
|
||||||
|
|
|
@ -11,7 +11,7 @@ foreach loader_inst : evas_image_loaders_file
|
||||||
shared_module('shared_loader_'+loader, file,
|
shared_module('shared_loader_'+loader, file,
|
||||||
c_args : package_c_args,
|
c_args : package_c_args,
|
||||||
include_directories : config_dir,
|
include_directories : config_dir,
|
||||||
dependencies : [eina, evas, evas_ext_deps] + loader_deps,
|
dependencies : [eina, evas, eet, evas_ext_none_static_deps] + loader_deps,
|
||||||
install : true,
|
install : true,
|
||||||
install_dir : mod_install_dir,
|
install_dir : mod_install_dir,
|
||||||
name_suffix : sys_mod_extension
|
name_suffix : sys_mod_extension
|
||||||
|
|
|
@ -11,7 +11,7 @@ foreach loader_inst : evas_image_savers_file
|
||||||
shared_module('shared_saver_'+loader, file,
|
shared_module('shared_saver_'+loader, file,
|
||||||
c_args : package_c_args,
|
c_args : package_c_args,
|
||||||
include_directories : config_dir,
|
include_directories : config_dir,
|
||||||
dependencies : [eina, evas, eet, evas_ext_deps] + loader_deps,
|
dependencies : [eina, evas, eet, evas_ext_none_static_deps] + loader_deps,
|
||||||
install : true,
|
install : true,
|
||||||
install_dir : mod_install_dir,
|
install_dir : mod_install_dir,
|
||||||
name_suffix : sys_mod_extension
|
name_suffix : sys_mod_extension
|
||||||
|
|
Loading…
Reference in New Issue