From 6d8e39a6425e721eb40e0cb1e67f1cbf5b223cc0 Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Fri, 4 Oct 2019 13:16:02 +0100 Subject: build - remove evas-modules option as its rather pointless evas-modules affects evas engine modules if they are static or shared, but ecore evas modules are still modules... so all in all this doesnt help much as it still requires modules to be separate from the shared libs, thus disallowing for statically linking efl into an app anyway etc. etc. etc. ... so less options to deal with, less complexity. better. --- meson.build | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) (limited to 'meson.build') diff --git a/meson.build b/meson.build index d653f96ede..b75bcf3e3f 100644 --- a/meson.build +++ b/meson.build @@ -252,21 +252,7 @@ evas_img_modules = ['evas' ,[], true, false, false, false evas_engines = [join_paths('evas', 'engines'),[], true, false, false, false, false, false, [], []] evas_goal = ['evas_goal' ,[], false, true, false, false, false, false, ['eina', 'efl', 'eo'], []] -if get_option('evas-modules') == 'static' - evas_settings = [ - evas_lib, - evas_img_modules, - evas_engines, - evas_goal, - ] -else - evas_settings = [ - evas_lib, - evas_img_modules, - evas_goal, - evas_engines, - ] -endif +evas_settings = [ evas_lib, evas_img_modules, evas_goal, evas_engines ] subprojects = [ # name | option | mod | lib | bin | bench | tests | examples | pkg-config options | name of static libs -- cgit v1.2.1