forked from enlightenment/efl
Revert "meson: fix race condition in building"
This reverts commit e1f3a4232e
.
git push on the wrong branch - sorry
This commit is contained in:
parent
e1f3a4232e
commit
e59603ee4c
|
@ -39,7 +39,7 @@ engine_include_dir = include_directories(join_paths('..','software_generic'))
|
||||||
if get_option('evas-modules') == 'shared' and not evas_force_static.contains(engine)
|
if get_option('evas-modules') == 'shared' and not evas_force_static.contains(engine)
|
||||||
shared_module(mod_full_name, engine_src,
|
shared_module(mod_full_name, engine_src,
|
||||||
include_directories : config_dir + [engine_include_dir],
|
include_directories : config_dir + [engine_include_dir],
|
||||||
dependencies : [eina, evas_pre] + engine_deps + [software_generic],
|
dependencies : [eina, evas_pre] + engine_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
|
||||||
|
|
|
@ -67,12 +67,6 @@ foreach engine_conf : engines
|
||||||
dependencies : [eina, evas_pre] + engine_deps,
|
dependencies : [eina, evas_pre] + engine_deps,
|
||||||
)
|
)
|
||||||
|
|
||||||
if engine == 'software_generic'
|
|
||||||
software_generic = declare_dependency(
|
|
||||||
include_directories: engine_include_dir,
|
|
||||||
link_with : tmp
|
|
||||||
)
|
|
||||||
endif
|
|
||||||
if engine == 'gl_common'
|
if engine == 'gl_common'
|
||||||
#gl_common will only be used by gl_generic, NOT by libevas.so, so we work arround the static list
|
#gl_common will only be used by gl_generic, NOT by libevas.so, so we work arround the static list
|
||||||
gl_common = declare_dependency(
|
gl_common = declare_dependency(
|
||||||
|
|
Loading…
Reference in New Issue