bu5hm4n pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=935c17c6551ddf2990a774b385318ad276b61317
commit 935c17c6551ddf2990a774b385318ad276b61317 Author: Stefan Schmidt <[email protected]> Date: Mon May 18 17:58:28 2020 +0200 build: modules: harmonize use of package_c_args Adding it to all missing places so we can control it from the central meson.build file. Reviewed-by: Marcel Hollerbach <[email protected]> Reviewed-by: João Paulo Taylor Ienczak Zanette <[email protected]> Differential Revision: https://phab.enlightenment.org/D11855 --- src/modules/ecore_evas/engines/extn/meson.build | 1 + src/modules/ecore_evas/engines/sdl/meson.build | 1 + src/modules/ecore_evas/engines/win32/meson.build | 1 + src/modules/elementary/access_output/meson.build | 1 + src/modules/elementary/prefs/meson.build | 1 + src/modules/elementary/test_entry/meson.build | 1 + src/modules/elementary/test_map/meson.build | 1 + src/modules/evas/engines/buffer/meson.build | 1 + src/modules/evas/engines/software_ddraw/meson.build | 1 + src/modules/evas/engines/software_gdi/meson.build | 1 + src/modules/evas/image_loaders/meson.build | 1 + src/modules/evas/image_savers/meson.build | 1 + 12 files changed, 12 insertions(+) diff --git a/src/modules/ecore_evas/engines/extn/meson.build b/src/modules/ecore_evas/engines/extn/meson.build index 901a126f52..4a912b4fbd 100644 --- a/src/modules/ecore_evas/engines/extn/meson.build +++ b/src/modules/ecore_evas/engines/extn/meson.build @@ -2,6 +2,7 @@ engine_src = files(['ecore_evas_extn.c', 'ecore_evas_extn_buf.c', 'ecore_evas_ex engine_deps = [ecore_input, ecore_ipc] shared_module(mod_full_name, engine_src, + c_args : package_c_args, include_directories : config_dir + [engine_include_dir], dependencies : [eina, ecore_evas, ecore_input_evas, rt] + engine_deps, install : true, diff --git a/src/modules/ecore_evas/engines/sdl/meson.build b/src/modules/ecore_evas/engines/sdl/meson.build index 94b990df92..030ca6561a 100644 --- a/src/modules/ecore_evas/engines/sdl/meson.build +++ b/src/modules/ecore_evas/engines/sdl/meson.build @@ -2,6 +2,7 @@ engine_src = files(['ecore_evas_sdl.c']) engine_deps = [ecore_sdl, ecore_input, ecore, dependency('sdl2')] shared_module(mod_full_name, engine_src, + c_args : package_c_args, include_directories : config_dir + [engine_include_dir], dependencies : [eina, ecore_evas, ecore_input_evas] + engine_deps, install : true, diff --git a/src/modules/ecore_evas/engines/win32/meson.build b/src/modules/ecore_evas/engines/win32/meson.build index 65fbfc1bb1..197f306e83 100644 --- a/src/modules/ecore_evas/engines/win32/meson.build +++ b/src/modules/ecore_evas/engines/win32/meson.build @@ -6,6 +6,7 @@ config_h.set('BUILD_ECORE_EVAS_SOFTWARE_GDI', '1') engine_deps = [engine_software_ddraw, engine_software_gdi] shared_module(mod_full_name, engine_src, + c_args : package_c_args, include_directories : config_dir + [engine_include_dir], dependencies : [eina, ecore_win32, ecore_input, ecore_evas, ecore_input_evas] + engine_deps, install : true, diff --git a/src/modules/elementary/access_output/meson.build b/src/modules/elementary/access_output/meson.build index f949d07671..55934ba292 100644 --- a/src/modules/elementary/access_output/meson.build +++ b/src/modules/elementary/access_output/meson.build @@ -4,6 +4,7 @@ src = files([ shared_module(mod, src, + c_args : package_c_args, dependencies: [elementary], install: true, install_dir : mod_install_dir, diff --git a/src/modules/elementary/prefs/meson.build b/src/modules/elementary/prefs/meson.build index f36adf2965..974ebb52ee 100644 --- a/src/modules/elementary/prefs/meson.build +++ b/src/modules/elementary/prefs/meson.build @@ -18,6 +18,7 @@ src = files([ shared_module(mod, src, + c_args : package_c_args, dependencies: [elementary], install: true, install_dir : mod_install_dir, diff --git a/src/modules/elementary/test_entry/meson.build b/src/modules/elementary/test_entry/meson.build index f949d07671..55934ba292 100644 --- a/src/modules/elementary/test_entry/meson.build +++ b/src/modules/elementary/test_entry/meson.build @@ -4,6 +4,7 @@ src = files([ shared_module(mod, src, + c_args : package_c_args, dependencies: [elementary], install: true, install_dir : mod_install_dir, diff --git a/src/modules/elementary/test_map/meson.build b/src/modules/elementary/test_map/meson.build index f949d07671..55934ba292 100644 --- a/src/modules/elementary/test_map/meson.build +++ b/src/modules/elementary/test_map/meson.build @@ -4,6 +4,7 @@ src = files([ shared_module(mod, src, + c_args : package_c_args, dependencies: [elementary], install: true, install_dir : mod_install_dir, diff --git a/src/modules/evas/engines/buffer/meson.build b/src/modules/evas/engines/buffer/meson.build index 8c6a071e77..23aef86b9a 100644 --- a/src/modules/evas/engines/buffer/meson.build +++ b/src/modules/evas/engines/buffer/meson.build @@ -14,6 +14,7 @@ install_headers('Evas_Engine_Buffer.h', ) evas_engine_buffer_mod = shared_module(mod_full_name, engine_src, + c_args : package_c_args, include_directories : config_dir + [engine_include_dir], dependencies : [eina, evas] + engine_deps, install : true, diff --git a/src/modules/evas/engines/software_ddraw/meson.build b/src/modules/evas/engines/software_ddraw/meson.build index 9b742757fa..1b58f71a04 100644 --- a/src/modules/evas/engines/software_ddraw/meson.build +++ b/src/modules/evas/engines/software_ddraw/meson.build @@ -9,6 +9,7 @@ engine_deps = [cc.find_library('ddraw')] shared_module(mod_full_name, engine_src, include_directories : config_dir + [engine_include_dir], + c_args : package_c_args, cpp_args: ['-fno-rtti', '-fno-exceptions'], dependencies : [eina, evas] + engine_deps, install : true, diff --git a/src/modules/evas/engines/software_gdi/meson.build b/src/modules/evas/engines/software_gdi/meson.build index ef7a0aa690..50bbb546ed 100644 --- a/src/modules/evas/engines/software_gdi/meson.build +++ b/src/modules/evas/engines/software_gdi/meson.build @@ -8,6 +8,7 @@ engine_src = files([ engine_deps = [cc.find_library('gdi32')] shared_module(mod_full_name, engine_src, + c_args : package_c_args, include_directories : config_dir + [engine_include_dir], dependencies : [eina, evas] + engine_deps, install : true, diff --git a/src/modules/evas/image_loaders/meson.build b/src/modules/evas/image_loaders/meson.build index 7a339b44c5..999cb865a4 100644 --- a/src/modules/evas/image_loaders/meson.build +++ b/src/modules/evas/image_loaders/meson.build @@ -9,6 +9,7 @@ foreach loader_inst : evas_image_loaders_file evas_package_modules = join_paths(dir_lib, 'evas', 'modules') mod_install_dir = join_paths(evas_package_modules, 'image_loaders', loader, version_name) shared_module('shared_loader_'+loader, file, + c_args : package_c_args, include_directories : config_dir, dependencies : [eina, evas] + loader_deps, install : true, diff --git a/src/modules/evas/image_savers/meson.build b/src/modules/evas/image_savers/meson.build index 6e1e346d06..7ba39aa287 100644 --- a/src/modules/evas/image_savers/meson.build +++ b/src/modules/evas/image_savers/meson.build @@ -9,6 +9,7 @@ foreach loader_inst : evas_image_savers_file evas_package_modules = join_paths(dir_lib, 'evas', 'modules') mod_install_dir = join_paths(evas_package_modules, 'image_savers', loader, version_name) shared_module('shared_saver_'+loader, file, + c_args : package_c_args, include_directories : config_dir, dependencies : [eina, evas] + loader_deps, install : true, --
