diff --git a/.ci/ci-configure.sh b/.ci/ci-configure.sh index 54ed89d4a5..97fcb1785d 100755 --- a/.ci/ci-configure.sh +++ b/.ci/ci-configure.sh @@ -25,7 +25,7 @@ if [ "$DISTRO" != "" ] ; then DISABLED_LINUX_COPTS=" -Daudio=false -Davahi=false -Dx11=false -Dphysics=false -Deeze=false \ -Dopengl=none -Deina-magic-debug=false -Dbuild-examples=false -Dbuild-tests=false \ -Dcrypto=gnutls -Dglib=false -Dgstreamer=false -Dsystemd=false -Dpulseaudio=false \ - -Dnetwork-backend=connman -Dxinput2=false -Dtslib=false -Devas-modules=static \ + -Dnetwork-backend=connman -Dxinput2=false -Dtslib=false \ -Devas-loaders-disabler=gst,pdf,ps,raw,svg,xcf,bmp,dds,eet,generic,gif,ico,jp2k,json,pmaps,psd,tga,tgv,tiff,wbmp,webp,xpm \ -Decore-imf-loaders-disabler=xim,ibus,scim -Demotion-loaders-disabler=gstreamer,gstreamer1,libvlc,xine \ -Demotion-generic-loaders-disabler=vlc -Dfribidi=false -Dfontconfig=false \ @@ -37,7 +37,7 @@ if [ "$DISTRO" != "" ] ; then MINGW_COPTS="--cross-file .ci/cross_toolchain.txt -Davahi=false -Deeze=false -Dsystemd=false \ -Dpulseaudio=false -Dx11=false -Dopengl=none -Dlibmount=false \ - -Devas-loaders-disabler=json,pdf,ps,raw,svg,rsvg -Devas-modules=static -Dbindings=luajit \ + -Devas-loaders-disabler=json,pdf,ps,raw,svg,rsvg -Dbindings=luajit \ -Dharfbuzz=true -Dpixman=true -Dembedded-lz4=false " if [ "$1" = "options-enabled" ]; then 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 diff --git a/meson_options.txt b/meson_options.txt index 33e74dedbb..0a4702cad8 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -192,13 +192,6 @@ option('unmount-path', description : 'Path to the unmount binary, if "detect" internal eeze bins are used' ) -option('evas-modules', - type : 'combo', - choices : ['shared', 'static'], - value : 'shared', - description : 'Should modules be shared or statically inlined' -) - option('evas-loaders-disabler', type : 'array', description : 'List of modular image/vector loaders to disable in efl', diff --git a/src/modules/evas/engines/buffer/meson.build b/src/modules/evas/engines/buffer/meson.build index ef42fd41bf..8c6a071e77 100644 --- a/src/modules/evas/engines/buffer/meson.build +++ b/src/modules/evas/engines/buffer/meson.build @@ -13,15 +13,11 @@ install_headers('Evas_Engine_Buffer.h', install_dir : join_paths(dir_include, 'evas-'+version_major), ) -if get_option('evas-modules') == 'shared' - evas_engine_buffer_mod = shared_module(mod_full_name, engine_src, - include_directories : config_dir + [engine_include_dir], - dependencies : [eina, evas] + engine_deps, - install : true, - install_dir : mod_install_dir, - name_suffix : sys_mod_extension - ) - module_files += join_paths(mod_install_dir, 'lib'+mod_full_name + '.' + sys_mod_extension) -else - evas_engine_buffer_mod = [] -endif +evas_engine_buffer_mod = shared_module(mod_full_name, engine_src, + include_directories : config_dir + [engine_include_dir], + dependencies : [eina, evas] + engine_deps, + install : true, + install_dir : mod_install_dir, + name_suffix : sys_mod_extension +) +module_files += join_paths(mod_install_dir, 'lib'+mod_full_name + '.' + sys_mod_extension) diff --git a/src/modules/evas/engines/drm/meson.build b/src/modules/evas/engines/drm/meson.build index 441a09a316..fb97b631de 100644 --- a/src/modules/evas/engines/drm/meson.build +++ b/src/modules/evas/engines/drm/meson.build @@ -7,13 +7,11 @@ engine_src = files([ engine_deps = [ecore_drm2, libdrm] -if get_option('evas-modules') == 'shared' - shared_module(mod_full_name, engine_src, - include_directories : config_dir + [engine_include_dir], - dependencies : [eina, evas] + engine_deps, - install : true, - install_dir : mod_install_dir, - name_suffix : sys_mod_extension - ) - module_files += join_paths(mod_install_dir, 'lib'+mod_full_name + '.' + sys_mod_extension) -endif +shared_module(mod_full_name, engine_src, + include_directories : config_dir + [engine_include_dir], + dependencies : [eina, evas] + engine_deps, + install : true, + install_dir : mod_install_dir, + name_suffix : sys_mod_extension +) +module_files += join_paths(mod_install_dir, 'lib'+mod_full_name + '.' + sys_mod_extension) diff --git a/src/modules/evas/engines/fb/meson.build b/src/modules/evas/engines/fb/meson.build index c857e83aec..625edd5d33 100644 --- a/src/modules/evas/engines/fb/meson.build +++ b/src/modules/evas/engines/fb/meson.build @@ -9,13 +9,11 @@ engine_src = files([ engine_deps = [ecore_fb] -if get_option('evas-modules') == 'shared' - shared_module(mod_full_name, engine_src, - include_directories : config_dir + [engine_include_dir], - dependencies : [eina, evas] + engine_deps, - install : true, - install_dir : mod_install_dir, - name_suffix : sys_mod_extension - ) - module_files += join_paths(mod_install_dir, 'lib'+mod_full_name + '.' + sys_mod_extension) -endif +shared_module(mod_full_name, engine_src, + include_directories : config_dir + [engine_include_dir], + dependencies : [eina, evas] + engine_deps, + install : true, + install_dir : mod_install_dir, + name_suffix : sys_mod_extension +) +module_files += join_paths(mod_install_dir, 'lib'+mod_full_name + '.' + sys_mod_extension) diff --git a/src/modules/evas/engines/gl_cocoa/meson.build b/src/modules/evas/engines/gl_cocoa/meson.build index a175c3c730..a0bd765c9b 100644 --- a/src/modules/evas/engines/gl_cocoa/meson.build +++ b/src/modules/evas/engines/gl_cocoa/meson.build @@ -7,13 +7,11 @@ engine_src = files([ engine_deps = [ecore_cocoa, gl_deps] -if get_option('evas-modules') == 'shared' - shared_module(mod_full_name, engine_src, - include_directories : config_dir + [engine_include_dir], - dependencies : [eina, evas] + engine_deps, - install : true, - install_dir : mod_install_dir, - name_suffix : sys_mod_extension - ) - module_files += join_paths(mod_install_dir, 'lib'+mod_full_name + '.' + sys_mod_extension) -endif +shared_module(mod_full_name, engine_src, + include_directories : config_dir + [engine_include_dir], + dependencies : [eina, evas] + engine_deps, + install : true, + install_dir : mod_install_dir, + name_suffix : sys_mod_extension +) +module_files += join_paths(mod_install_dir, 'lib'+mod_full_name + '.' + sys_mod_extension) diff --git a/src/modules/evas/engines/gl_drm/meson.build b/src/modules/evas/engines/gl_drm/meson.build index 28988d5599..8acf82365d 100644 --- a/src/modules/evas/engines/gl_drm/meson.build +++ b/src/modules/evas/engines/gl_drm/meson.build @@ -7,13 +7,11 @@ engine_src = files([ engine_deps = [ecore_drm2, libdrm, gl_deps, dependency('gbm')] -if get_option('evas-modules') == 'shared' - shared_module(mod_full_name, engine_src, - include_directories : config_dir + [engine_include_dir], - dependencies : [eina, evas] + engine_deps, - install : true, - install_dir : mod_install_dir, - name_suffix : sys_mod_extension - ) - module_files += join_paths(mod_install_dir, 'lib'+mod_full_name + '.' + sys_mod_extension) -endif +shared_module(mod_full_name, engine_src, + include_directories : config_dir + [engine_include_dir], + dependencies : [eina, evas] + engine_deps, + install : true, + install_dir : mod_install_dir, + name_suffix : sys_mod_extension +) +module_files += join_paths(mod_install_dir, 'lib'+mod_full_name + '.' + sys_mod_extension) diff --git a/src/modules/evas/engines/gl_generic/meson.build b/src/modules/evas/engines/gl_generic/meson.build index 86e5c8fedd..d137eb26ef 100644 --- a/src/modules/evas/engines/gl_generic/meson.build +++ b/src/modules/evas/engines/gl_generic/meson.build @@ -70,13 +70,11 @@ engine_deps = [gl_deps] engine_include_dir = include_directories(join_paths('..','software_generic'), join_paths('..', 'gl_common')) -if get_option('evas-modules') == 'shared' - shared_module(mod_full_name, engine_src, - include_directories : config_dir + [engine_include_dir], - dependencies : [eina, evas] + engine_deps, - install : true, - install_dir : mod_install_dir, - name_suffix : sys_mod_extension - ) - module_files += join_paths(mod_install_dir, 'lib'+mod_full_name + '.' + sys_mod_extension) -endif +shared_module(mod_full_name, engine_src, + include_directories : config_dir + [engine_include_dir], + dependencies : [eina, evas] + engine_deps, + install : true, + install_dir : mod_install_dir, + name_suffix : sys_mod_extension +) +module_files += join_paths(mod_install_dir, 'lib'+mod_full_name + '.' + sys_mod_extension) diff --git a/src/modules/evas/engines/gl_x11/meson.build b/src/modules/evas/engines/gl_x11/meson.build index 7aec198e39..0bac84147e 100644 --- a/src/modules/evas/engines/gl_x11/meson.build +++ b/src/modules/evas/engines/gl_x11/meson.build @@ -7,13 +7,11 @@ engine_src = files([ engine_deps = [ecore_x_deps, gl_deps] -if get_option('evas-modules') == 'shared' - shared_module(mod_full_name, engine_src, - include_directories : config_dir + [engine_include_dir], - dependencies : [eina, evas] + engine_deps, - install : true, - install_dir : mod_install_dir, - name_suffix : sys_mod_extension - ) - module_files += join_paths(mod_install_dir, 'lib'+mod_full_name + '.' + sys_mod_extension) -endif +shared_module(mod_full_name, engine_src, + include_directories : config_dir + [engine_include_dir], + dependencies : [eina, evas] + engine_deps, + install : true, + install_dir : mod_install_dir, + name_suffix : sys_mod_extension +) +module_files += join_paths(mod_install_dir, 'lib'+mod_full_name + '.' + sys_mod_extension) diff --git a/src/modules/evas/engines/meson.build b/src/modules/evas/engines/meson.build index d0c1b8fe24..2504a761a9 100644 --- a/src/modules/evas/engines/meson.build +++ b/src/modules/evas/engines/meson.build @@ -62,28 +62,6 @@ foreach engine_conf : engines subdir(engine) - if get_option('evas-modules') == 'static' - tmp = static_library(mod_full_name, engine_src, - include_directories : config_dir + [engine_include_dir], - dependencies : [eina, evas_pre] + engine_deps, - ) - evas_static_list += declare_dependency( - include_directories: [include_directories('.')] + config_dir + [engine_include_dir], - link_with: tmp, - dependencies : [eina, evas_pre] + engine_deps, - sources : engine_src - ) - if engine == 'gl_generic' - #special case, see evas_module.c - config_h.set('EVAS_STATIC_BUILD_GL_COMMON', '1') - else - config_h.set('EVAS_STATIC_BUILD_'+engine.to_upper(), '1') - endif - else - #nothing here shared building is handled directly on the engine configuration side - #reason for this is that the .so files have to be placed in the correct directory in order - # to make them discoverable by evas module code - endif config_h.set('BUILD_ENGINE_'+engine.to_upper(), '1') endif endforeach diff --git a/src/modules/evas/engines/software_ddraw/meson.build b/src/modules/evas/engines/software_ddraw/meson.build index 404fe7c894..9b742757fa 100644 --- a/src/modules/evas/engines/software_ddraw/meson.build +++ b/src/modules/evas/engines/software_ddraw/meson.build @@ -7,14 +7,12 @@ engine_src = files([ engine_deps = [cc.find_library('ddraw')] -if get_option('evas-modules') == 'shared' - shared_module(mod_full_name, engine_src, - include_directories : config_dir + [engine_include_dir], - cpp_args: ['-fno-rtti', '-fno-exceptions'], - dependencies : [eina, evas] + engine_deps, - install : true, - install_dir : mod_install_dir, - name_suffix : sys_mod_extension - ) - module_files += join_paths(mod_install_dir, 'lib'+mod_full_name + '.' + sys_mod_extension) -endif +shared_module(mod_full_name, engine_src, + include_directories : config_dir + [engine_include_dir], + cpp_args: ['-fno-rtti', '-fno-exceptions'], + dependencies : [eina, evas] + engine_deps, + install : true, + install_dir : mod_install_dir, + name_suffix : sys_mod_extension +) +module_files += join_paths(mod_install_dir, 'lib'+mod_full_name + '.' + sys_mod_extension) diff --git a/src/modules/evas/engines/software_gdi/meson.build b/src/modules/evas/engines/software_gdi/meson.build index e492e001e6..ef7a0aa690 100644 --- a/src/modules/evas/engines/software_gdi/meson.build +++ b/src/modules/evas/engines/software_gdi/meson.build @@ -7,13 +7,11 @@ engine_src = files([ engine_deps = [cc.find_library('gdi32')] -if get_option('evas-modules') == 'shared' - shared_module(mod_full_name, engine_src, - include_directories : config_dir + [engine_include_dir], - dependencies : [eina, evas] + engine_deps, - install : true, - install_dir : mod_install_dir, - name_suffix : sys_mod_extension - ) - module_files += join_paths(mod_install_dir, 'lib'+mod_full_name + '.' + sys_mod_extension) -endif +shared_module(mod_full_name, engine_src, + include_directories : config_dir + [engine_include_dir], + dependencies : [eina, evas] + engine_deps, + install : true, + install_dir : mod_install_dir, + name_suffix : sys_mod_extension +) +module_files += join_paths(mod_install_dir, 'lib'+mod_full_name + '.' + sys_mod_extension) diff --git a/src/modules/evas/engines/software_x11/meson.build b/src/modules/evas/engines/software_x11/meson.build index b5409568c0..c2f8f544e8 100644 --- a/src/modules/evas/engines/software_x11/meson.build +++ b/src/modules/evas/engines/software_x11/meson.build @@ -28,13 +28,11 @@ config_h.set('BUILD_ENGINE_SOFTWARE_XLIB', '1') #it looks weird but is right, gl_deps is needed for evas_x_egl.c engine_deps = [x11, ecore_x, ecore_x_deps, gl_deps] -if get_option('evas-modules') == 'shared' - shared_module(mod_full_name, engine_src, - include_directories : config_dir + [engine_include_dir], - dependencies : [eina, evas] + engine_deps, - install : true, - install_dir : mod_install_dir, - name_suffix : sys_mod_extension - ) - module_files += join_paths(mod_install_dir, 'lib'+mod_full_name + '.' + sys_mod_extension) -endif +shared_module(mod_full_name, engine_src, + include_directories : config_dir + [engine_include_dir], + dependencies : [eina, evas] + engine_deps, + install : true, + install_dir : mod_install_dir, + name_suffix : sys_mod_extension +) +module_files += join_paths(mod_install_dir, 'lib'+mod_full_name + '.' + sys_mod_extension) diff --git a/src/modules/evas/engines/wayland_egl/meson.build b/src/modules/evas/engines/wayland_egl/meson.build index 818210fc62..af7314627b 100644 --- a/src/modules/evas/engines/wayland_egl/meson.build +++ b/src/modules/evas/engines/wayland_egl/meson.build @@ -8,14 +8,11 @@ engine_deps = [ecore_wl2, dependency('wayland-egl'), gl_deps] engine_include_dir = include_directories(join_paths('..','wayland_common')) - -if get_option('evas-modules') == 'shared' - shared_module(mod_full_name, engine_src, - include_directories : config_dir + [engine_include_dir], - dependencies : [eina, evas] + engine_deps, - install : true, - install_dir : mod_install_dir, - name_suffix : sys_mod_extension - ) - module_files += join_paths(mod_install_dir, 'lib'+mod_full_name + '.' + sys_mod_extension) -endif +shared_module(mod_full_name, engine_src, + include_directories : config_dir + [engine_include_dir], + dependencies : [eina, evas] + engine_deps, + install : true, + install_dir : mod_install_dir, + name_suffix : sys_mod_extension +) +module_files += join_paths(mod_install_dir, 'lib'+mod_full_name + '.' + sys_mod_extension) diff --git a/src/modules/evas/engines/wayland_shm/meson.build b/src/modules/evas/engines/wayland_shm/meson.build index 29453841cc..2a181cea48 100644 --- a/src/modules/evas/engines/wayland_shm/meson.build +++ b/src/modules/evas/engines/wayland_shm/meson.build @@ -8,13 +8,11 @@ engine_deps = [ecore_wl2] engine_include_dir = include_directories(join_paths('..','wayland_common')) -if get_option('evas-modules') == 'shared' - shared_module(mod_full_name, engine_src, - include_directories : config_dir + [engine_include_dir], - dependencies : [eina, evas] + engine_deps, - install : true, - install_dir : mod_install_dir, - name_suffix : sys_mod_extension - ) - module_files += join_paths(mod_install_dir, 'lib'+mod_full_name + '.' + sys_mod_extension) -endif +shared_module(mod_full_name, engine_src, + include_directories : config_dir + [engine_include_dir], + dependencies : [eina, evas] + engine_deps, + install : true, + install_dir : mod_install_dir, + name_suffix : sys_mod_extension +) +module_files += join_paths(mod_install_dir, 'lib'+mod_full_name + '.' + sys_mod_extension)