raster pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=63b5d81983374838194b6335cc1c7b5ab9db749a
commit 63b5d81983374838194b6335cc1c7b5ab9db749a Author: Carsten Haitzler (Rasterman) <[email protected]> Date: Mon May 18 11:13:59 2020 +0100 Revert "Fix EAPI definition by defining EFL_BUILD for each built DLL" This reverts commit 3ade45cbc82bea1772c7ad1afb7e1ba5dd67d930. --- meson.build | 3 ++- src/benchmarks/eina/meson.build | 2 +- src/benchmarks/elementary/meson.build | 1 - src/edje_external/elementary/meson.build | 2 +- src/edje_external/emotion/meson.build | 2 +- src/lib/ecore/meson.build | 4 +--- src/lib/ecore_audio/meson.build | 3 --- src/lib/ecore_con/meson.build | 4 +--- src/lib/ecore_evas/meson.build | 2 -- src/lib/ecore_file/meson.build | 2 -- src/lib/ecore_imf/meson.build | 3 +-- src/lib/ecore_imf_evas/meson.build | 4 +--- src/lib/ecore_input/meson.build | 2 -- src/lib/ecore_input_evas/ecore_input_evas.c | 4 ++-- src/lib/ecore_input_evas/meson.build | 2 -- src/lib/ecore_ipc/meson.build | 3 --- src/lib/ecore_sdl/meson.build | 4 +--- src/lib/ecore_win32/meson.build | 4 +--- src/lib/ector/meson.build | 3 --- src/lib/edje/meson.build | 4 +--- src/lib/eet/meson.build | 3 --- src/lib/efl/meson.build | 3 --- src/lib/efreet/meson.build | 8 +++----- src/lib/eina/meson.build | 3 --- src/lib/eio/meson.build | 4 +--- src/lib/eldbus/meson.build | 3 --- src/lib/elementary/Efl_Ui.h | 7 +++++++ src/lib/elementary/meson.build | 6 ++++-- src/lib/elua/Elua.h | 16 ++++++++-------- src/lib/elua/cache.c | 4 ++-- src/lib/elua/io.c | 4 ++-- src/lib/elua/meson.build | 4 +--- src/lib/embryo/embryo_main.c | 2 -- src/lib/embryo/embryo_private.h | 2 ++ src/lib/embryo/embryo_str.c | 2 -- src/lib/embryo/meson.build | 4 +--- src/lib/emile/meson.build | 3 --- src/lib/emotion/meson.build | 6 +++--- src/lib/eo/meson.build | 7 +------ src/lib/eolian/meson.build | 4 +--- src/lib/ephysics/meson.build | 4 +--- src/lib/ethumb/meson.build | 4 +--- src/lib/ethumb_client/meson.build | 4 +--- src/lib/evas/meson.build | 5 +---- src/lib/evil/meson.build | 3 --- src/modules/ecore_evas/engines/extn/meson.build | 3 --- src/modules/ecore_evas/engines/sdl/meson.build | 3 --- src/modules/ecore_evas/engines/win32/meson.build | 3 --- src/modules/elementary/access_output/meson.build | 3 --- src/modules/elementary/prefs/meson.build | 3 --- src/modules/elementary/test_entry/meson.build | 3 --- src/modules/elementary/test_map/meson.build | 3 --- src/modules/emotion/gstreamer1/meson.build | 4 +--- src/modules/ethumb/emotion/meson.build | 4 +--- src/modules/evas/engines/buffer/meson.build | 3 --- src/modules/evas/engines/software_ddraw/meson.build | 6 +----- src/modules/evas/engines/software_gdi/meson.build | 3 --- src/modules/evas/image_loaders/meson.build | 1 - src/modules/evas/image_savers/meson.build | 1 - 59 files changed, 57 insertions(+), 159 deletions(-) diff --git a/meson.build b/meson.build index b36e9010c5..b55855920c 100644 --- a/meson.build +++ b/meson.build @@ -96,7 +96,7 @@ foreach lang : ['c', 'objc', 'cpp'] add_global_arguments('-D_GNU_SOURCE=1', language: lang) add_global_arguments('-DEFL_BETA_API_SUPPORT=1', language: lang) add_global_arguments('-DNEED_RUN_IN_TREE=1', language: lang) - add_global_arguments('-DDLL_EXPORT=1', language: lang) + add_global_arguments('-DEFL_BUILD=1', language: lang) add_global_arguments('-DELM_INTERNAL_API_ARGESFSDFEFC=1', language: lang) if sys_windows == true add_global_arguments('-D_POSIX_C_SOURCE=200809L', language: lang) @@ -239,6 +239,7 @@ if sys_exe_extension == '' else config_h.set_quoted('EXE_SUFFIX', '.'+sys_exe_extension) endif +config_h.set('EFL_BUILD', '1') if get_option('tslib') == true config_h.set('HAVE_TSLIB', '1') diff --git a/src/benchmarks/eina/meson.build b/src/benchmarks/eina/meson.build index 2c3d40013e..9b924dd1b9 100644 --- a/src/benchmarks/eina/meson.build +++ b/src/benchmarks/eina/meson.build @@ -31,7 +31,7 @@ city = shared_library('city', eina_bench = executable('eina_bench', sources : eina_bench_src, dependencies : eina, - c_args: ['-fPIC','-DCITYHASH_BENCH', '-DEINA_ENABLE_BENCH_E17', '-DEFL_BUILD'], + c_args : ['-fPIC','-DCITYHASH_BENCH', '-DEINA_ENABLE_BENCH_E17'], include_directories : config_dir, link_with : city, ) diff --git a/src/benchmarks/elementary/meson.build b/src/benchmarks/elementary/meson.build index d174a93433..8cb1b99057 100644 --- a/src/benchmarks/elementary/meson.build +++ b/src/benchmarks/elementary/meson.build @@ -10,7 +10,6 @@ benchmark('focus_widget_tree', focus_widget_tree_bench, item_container = executable('collection', 'collection.c', - c_args: ['-DEFL_BUILD'], dependencies: [elementary, ecore_input_evas, eio], ) diff --git a/src/edje_external/elementary/meson.build b/src/edje_external/elementary/meson.build index 3c716331c1..033b54eab8 100644 --- a/src/edje_external/elementary/meson.build +++ b/src/edje_external/elementary/meson.build @@ -45,7 +45,7 @@ ecore_systemd_mod = shared_module('elementary', dependencies: [edje, elementary, elementary_deps], install: true, install_dir: mod_install_dir, - c_args : package_c_args, + c_args : elm_package_c_args, name_suffix : sys_mod_extension ) module_files += join_paths(mod_install_dir, 'libelementary.' + sys_mod_extension) diff --git a/src/edje_external/emotion/meson.build b/src/edje_external/emotion/meson.build index 6e3a6836b6..5d869d8b7a 100644 --- a/src/edje_external/emotion/meson.build +++ b/src/edje_external/emotion/meson.build @@ -3,7 +3,7 @@ ecore_systemd_mod = shared_module('emotion', dependencies: [edje, emotion], install: true, install_dir: mod_install_dir, - c_args : package_c_args, + c_args : emotion_package_c_args, name_suffix : sys_mod_extension ) module_files += join_paths(mod_install_dir, 'libemotion.' + sys_mod_extension) diff --git a/src/lib/ecore/meson.build b/src/lib/ecore/meson.build index 3c7bb8834f..637761dcc4 100644 --- a/src/lib/ecore/meson.build +++ b/src/lib/ecore/meson.build @@ -192,14 +192,12 @@ if get_option('g-mainloop') == true endif endif -ecore_c_args = package_c_args + [ '-DEFL_BUILD' ] - ecore_lib = library('ecore', ecore_src, pub_eo_file_target, - c_args : ecore_c_args, dependencies: ecore_pub_deps + [m, buildsystem, ecore_deps], include_directories : config_dir + [include_directories(join_paths('..','..'))], install: true, + c_args : package_c_args, version : meson.project_version() ) diff --git a/src/lib/ecore_audio/meson.build b/src/lib/ecore_audio/meson.build index d3b0b12e8d..c03eb3e663 100644 --- a/src/lib/ecore_audio/meson.build +++ b/src/lib/ecore_audio/meson.build @@ -77,11 +77,8 @@ if sys_windows == true ecore_audio_deps += [cc.find_library('ksuser', required: true), cc.find_library('winmm', required: true)] endif -ecore_audio_c_args = [ '-DEFL_BUILD' ] - ecore_audio_lib = library('ecore_audio', ecore_audio_src, pub_eo_file_target, - c_args : ecore_audio_c_args, dependencies: ecore_audio_pub_deps + [m] + ecore_audio_deps, include_directories : config_dir, install: true, diff --git a/src/lib/ecore_con/meson.build b/src/lib/ecore_con/meson.build index bd6562e0b2..44faa486af 100644 --- a/src/lib/ecore_con/meson.build +++ b/src/lib/ecore_con/meson.build @@ -182,14 +182,12 @@ endif ecore_con_deps += crypto -ecore_con_c_args = package_c_args + [ '-DEFL_BUILD' ] - ecore_con_lib = library('ecore_con', ecore_con_src, pub_eo_file_target, dependencies: [ecore, ecore_con_deps, http_parser, eldbus, eet, buildsystem, dl], include_directories : config_dir, install: true, - c_args : ecore_con_c_args, + c_args : package_c_args, version : meson.project_version() ) diff --git a/src/lib/ecore_evas/meson.build b/src/lib/ecore_evas/meson.build index 7d2018ca32..890e3c42b3 100644 --- a/src/lib/ecore_evas/meson.build +++ b/src/lib/ecore_evas/meson.build @@ -27,11 +27,9 @@ ecore_evas_src = [ 'ecore_evas_fallback_selection.c' ] -ecore_evas_c_args = [ '-DEFL_BUILD' ] ecore_evas_lib = library('ecore_evas', ecore_evas_src, pub_eo_file_target, - c_args: ecore_evas_c_args, dependencies: [ecore_evas_deps, buildsystem], include_directories : config_dir, install: true, diff --git a/src/lib/ecore_file/meson.build b/src/lib/ecore_file/meson.build index 8cf9b23e57..727c3d372c 100644 --- a/src/lib/ecore_file/meson.build +++ b/src/lib/ecore_file/meson.build @@ -19,11 +19,9 @@ endif ecore_file_header_src = ['Ecore_File.h'] -ecore_file_c_args = [ '-DEFL_BUILD' ] ecore_file_lib = library('ecore_file', ecore_file_src, - c_args : ecore_file_c_args, dependencies: ecore_file_deps + ecore_file_pub_deps + ecore_file_deps, include_directories : config_dir + [include_directories(join_paths('..','..'))], install: true, diff --git a/src/lib/ecore_imf/meson.build b/src/lib/ecore_imf/meson.build index 1dd94241e4..978594d20a 100644 --- a/src/lib/ecore_imf/meson.build +++ b/src/lib/ecore_imf/meson.build @@ -12,13 +12,12 @@ ecore_imf_src = [ 'ecore_imf_private.h', ] -ecore_imf_c_args = package_c_args + [ '-DEFL_BUILD' ] ecore_imf_lib = library('ecore_imf', ecore_imf_src, pub_eo_file_target, dependencies: [buildsystem, ecore_imf_deps, ecore_imf_pub_deps], include_directories : config_dir, - c_args : ecore_imf_c_args, + c_args : package_c_args, install: true, version : meson.project_version() ) diff --git a/src/lib/ecore_imf_evas/meson.build b/src/lib/ecore_imf_evas/meson.build index 5245a8871f..28d53ea78d 100644 --- a/src/lib/ecore_imf_evas/meson.build +++ b/src/lib/ecore_imf_evas/meson.build @@ -9,14 +9,12 @@ ecore_imf_evas_src = [ ecore_imf_evas_deps = [ecore_imf, evas] ecore_imf_evas_pub_deps = [eina, eo, efl] -ecore_imf_evas_c_args = package_c_args + [ '-DEFL_BUILD' ] - ecore_imf_evas_lib = library('ecore_imf_evas', ecore_imf_evas_src, dependencies: ecore_imf_evas_pub_deps + [m] + ecore_imf_evas_deps, include_directories : config_dir + [include_directories('.')], install: true, - c_args : ecore_imf_evas_c_args, + c_args : package_c_args, version : meson.project_version() ) diff --git a/src/lib/ecore_input/meson.build b/src/lib/ecore_input/meson.build index 745d5b5d83..c57ec4e04c 100644 --- a/src/lib/ecore_input/meson.build +++ b/src/lib/ecore_input/meson.build @@ -17,11 +17,9 @@ if get_option('eeze') ecore_input_deps += eeze endif -ecore_input_c_args = [ '-DEFL_BUILD' ] ecore_input_lib = library('ecore_input', ecore_input_src, pub_eo_file_target, - c_args: ecore_input_c_args, dependencies: ecore_input_pub_deps + ecore_input_deps, include_directories : config_dir, install: true, diff --git a/src/lib/ecore_input_evas/ecore_input_evas.c b/src/lib/ecore_input_evas/ecore_input_evas.c index ea07300e7a..8f26737778 100644 --- a/src/lib/ecore_input_evas/ecore_input_evas.c +++ b/src/lib/ecore_input_evas/ecore_input_evas.c @@ -7,8 +7,8 @@ #include <string.h> #include <stdlib.h> -#include <Ecore.h> -#include <Ecore_Input.h> +#include "Ecore.h" +#include "Ecore_Input.h" #include "Ecore_Input_Evas.h" #include "ecore_input_evas_private.h" diff --git a/src/lib/ecore_input_evas/meson.build b/src/lib/ecore_input_evas/meson.build index 5deb298796..8b48142f7d 100644 --- a/src/lib/ecore_input_evas/meson.build +++ b/src/lib/ecore_input_evas/meson.build @@ -11,11 +11,9 @@ ecore_input_evas_src = [ 'ecore_input_evas_private.h', ] -ecore_input_evas_c_args = [ '-DEFL_BUILD' ] ecore_input_evas_lib = library('ecore_input_evas', ecore_input_evas_src, pub_eo_file_target, - c_args : ecore_input_evas_c_args, dependencies: ecore_input_evas_pub_deps + ecore_input_evas_deps, include_directories : config_dir, install: true, diff --git a/src/lib/ecore_ipc/meson.build b/src/lib/ecore_ipc/meson.build index c7fa2480c5..dbc95b0531 100644 --- a/src/lib/ecore_ipc/meson.build +++ b/src/lib/ecore_ipc/meson.build @@ -10,11 +10,8 @@ ecore_ipc_src = [ 'ecore_ipc_private.h', ] -ecore_ipc_c_args = [ '-DEFL_BUILD' ] - ecore_ipc_lib = library('ecore_ipc', ecore_ipc_src, pub_eo_file_target, - c_args : ecore_ipc_c_args, dependencies: ecore_ipc_deps + ecore_ipc_pub_deps, include_directories : config_dir, install: true, diff --git a/src/lib/ecore_sdl/meson.build b/src/lib/ecore_sdl/meson.build index 9aa9bbdbd5..b4685818c1 100644 --- a/src/lib/ecore_sdl/meson.build +++ b/src/lib/ecore_sdl/meson.build @@ -12,14 +12,12 @@ ecore_sdl_header_src = [ ecore_sdl_deps += dependency('sdl2') -ecore_sdl_c_args = package_c_args + [ '-DEFL_BUILD' ] - ecore_sdl_lib = library('ecore_sdl', ecore_sdl_src, dependencies: [m] + ecore_sdl_deps + ecore_sdl_pub_deps, include_directories : config_dir + [include_directories(join_paths('..','..'))], install: true, - c_args : ecore_sdl_c_args, + c_args : package_c_args, ) ecore_sdl = declare_dependency( diff --git a/src/lib/ecore_win32/meson.build b/src/lib/ecore_win32/meson.build index 48867e6a43..1bb4589f28 100644 --- a/src/lib/ecore_win32/meson.build +++ b/src/lib/ecore_win32/meson.build @@ -20,14 +20,12 @@ if sys_windows == true 'Ecore_Win32.h' ] - ecore_win32_c_args = package_c_args + [ '-DEFL_BUILD' ] - ecore_win32_lib = library('ecore_win32', ecore_win32_src, dependencies: ecore_win32_deps + ecore_win32_pub_deps, include_directories : config_dir, install: true, - c_args : ecore_win32_c_args, + c_args : package_c_args, ) ecore_win32 = declare_dependency( diff --git a/src/lib/ector/meson.build b/src/lib/ector/meson.build index 3dac471178..49fc5a477f 100644 --- a/src/lib/ector/meson.build +++ b/src/lib/ector/meson.build @@ -80,11 +80,8 @@ endforeach subdir('software') -ector_c_args = [ '-DEFL_BUILD' ] - ector_lib = library('ector', ector_src, pub_eo_file_target, - c_args : ector_c_args, dependencies: ector_pub_deps + [triangulator, freetype, draw, m] + ector_deps, include_directories : config_dir, install: true, diff --git a/src/lib/edje/meson.build b/src/lib/edje/meson.build index c2a9cf9578..84b8ac7318 100644 --- a/src/lib/edje/meson.build +++ b/src/lib/edje/meson.build @@ -144,14 +144,12 @@ edje_src = [ ] -edje_c_args = package_c_args + [ '-DEFL_BUILD' ] - edje_lib = library('edje', edje_src, pub_eo_file_target, priv_eo_file_target, dependencies: edje_pub_deps + edje_deps, include_directories : config_dir + [include_directories('.')], install: true, - c_args : edje_c_args, + c_args : [package_c_args], version : meson.project_version() ) diff --git a/src/lib/eet/meson.build b/src/lib/eet/meson.build index edc879405d..8ebdb48dd6 100644 --- a/src/lib/eet/meson.build +++ b/src/lib/eet/meson.build @@ -18,11 +18,8 @@ eet_src = [ 'eet_utils.c', ] -eet_c_args = [ '-DEFL_BUILD' ] - eet_lib = library('eet', eet_src, pub_eo_file_target, - c_args : eet_c_args, dependencies: eet_deps + eet_pub_deps, include_directories : config_dir, install: true, diff --git a/src/lib/efl/meson.build b/src/lib/efl/meson.build index 152dfb0e3c..d5805be9b3 100644 --- a/src/lib/efl/meson.build +++ b/src/lib/efl/meson.build @@ -11,11 +11,8 @@ efl_src = [] subdir('interfaces') package_header_subdirs += 'interfaces' -efl_c_args = [ '-DEFL_BUILD' ] - efl_lib = library('efl', efl_src, pub_eo_file_target, - c_args : efl_c_args, dependencies: [eina, eo, m], install: true, version : meson.project_version() diff --git a/src/lib/efreet/meson.build b/src/lib/efreet/meson.build index bc3f8f8d28..f438b02845 100644 --- a/src/lib/efreet/meson.build +++ b/src/lib/efreet/meson.build @@ -31,14 +31,12 @@ efreet_src = [ efreet_deps = [eet, ecore, ecore_con, ecore_file, eo, efl, eina, emile, ecore_ipc, buildsystem,intl] efreet_pub_deps = [eina, eo, efl] -efreet_c_args = package_c_args + [ '-DEFL_BUILD' ] - efreet_lib = library('efreet', efreet_src, dependencies: efreet_pub_deps + [m] + efreet_deps, include_directories : config_dir + [include_directories('.')], install: true, - c_args : [efreet_c_args, '-DDATA_DIR="'+dir_data+'"'], + c_args : [package_c_args, '-DDATA_DIR="'+dir_data+'"'], version : meson.project_version() ) @@ -53,7 +51,7 @@ efreet_mime_lib = library('efreet_mime', dependencies: efreet_pub_deps + [m, efreet, efreet_deps], include_directories : config_dir + [include_directories('.')], install: true, - c_args : efreet_c_args, + c_args : package_c_args, version : meson.project_version() ) @@ -69,7 +67,7 @@ efreet_trash_lib = library('efreet_trash', dependencies: efreet_pub_deps + [efreet, efreet_deps], include_directories : config_dir + [include_directories('.')], install: true, - c_args : efreet_c_args, + c_args : package_c_args, version : meson.project_version() ) diff --git a/src/lib/eina/meson.build b/src/lib/eina/meson.build index c8dbe3904a..ce7cfe84f1 100644 --- a/src/lib/eina/meson.build +++ b/src/lib/eina/meson.build @@ -361,10 +361,7 @@ endif execinfo = cc.find_library('execinfo', required: false) -eina_c_args = [ '-DEFL_BUILD' ] - eina_lib = library('eina', sources, - c_args : eina_c_args, include_directories : config_dir, dependencies: [m, rt, dl, execinfo, iconv, eina_deps, thread_dep, eina_mem_pools, evil], install: true, diff --git a/src/lib/eio/meson.build b/src/lib/eio/meson.build index 9d35187c13..f95a1e652c 100644 --- a/src/lib/eio/meson.build +++ b/src/lib/eio/meson.build @@ -66,14 +66,12 @@ endif eio_deps = [ecore, ecore_file, eet, eo, eina, efl, emile, efreet_mime] eio_pub_deps = [eina, eet] -eio_c_args = package_c_args + [ '-DEFL_BUILD' ] - eio_lib = library('eio', eio_src, pub_eo_file_target, dependencies: [eina, eo, efl, m, eio_deps], include_directories : config_dir + [include_directories('.')], install: true, - c_args : eio_c_args, + c_args : package_c_args, link_args : linker_args, version : meson.project_version() ) diff --git a/src/lib/eldbus/meson.build b/src/lib/eldbus/meson.build index de30aca5d7..054273acf8 100644 --- a/src/lib/eldbus/meson.build +++ b/src/lib/eldbus/meson.build @@ -94,11 +94,8 @@ eldbus_src = [ eldbus_deps += dependency('dbus-1') -eldbus_c_args = [ '-DEFL_BUILD' ] - eldbus_lib = library('eldbus', eldbus_src, pub_eo_file_target, - c_args : eldbus_c_args, dependencies: eldbus_pub_deps + eldbus_deps, include_directories : config_dir, install: true, diff --git a/src/lib/elementary/Efl_Ui.h b/src/lib/elementary/Efl_Ui.h index e2d0cf6abe..ffc5fd43c5 100644 --- a/src/lib/elementary/Efl_Ui.h +++ b/src/lib/elementary/Efl_Ui.h @@ -40,6 +40,13 @@ #include <alloca.h> #endif +#ifdef ELM_WIN32 +#include <malloc.h> +#ifndef alloca +#define alloca _alloca +#endif +#endif + #ifdef _WIN32 # define WIN32_LEAN_AND_MEAN # include <winsock2.h> diff --git a/src/lib/elementary/meson.build b/src/lib/elementary/meson.build index bdbc2e6ca8..29e7dfc3df 100644 --- a/src/lib/elementary/meson.build +++ b/src/lib/elementary/meson.build @@ -962,6 +962,8 @@ config_h.set_quoted('ICON_DIR', join_paths(dir_lib, 'icons')) if sys_windows == false elm_options.set('ELM_UNIX', '1') +else + elm_options.set('DLL_EXPORT', '1') endif elm_options.set('ELM_EFREET', '1') @@ -1008,14 +1010,14 @@ c = configure_file( install_dir : dir_package_include, configuration: elm_options) -elm_c_args = package_c_args + ['-DEFL_BUILD=1'] +elm_package_c_args = package_c_args + ['-DELEMENTARY_BUILD=1'] elementary_lib = library('elementary', elementary_src, pub_eo_file_target, priv_eo_file_target, c, embed_config, dependencies: elementary_pub_deps + elementary_deps, include_directories : config_dir + [include_directories('.')] + [include_directories(join_paths('..', '..', '..'))] + [ecore_evas_wayland_engine_include_dir], install: true, - c_args : elm_c_args, + c_args : elm_package_c_args, version : meson.project_version() ) diff --git a/src/lib/elua/Elua.h b/src/lib/elua/Elua.h index cf93d65e53..289f9112d7 100644 --- a/src/lib/elua/Elua.h +++ b/src/lib/elua/Elua.h @@ -18,14 +18,6 @@ #ifndef _ELUA_H #define _ELUA_H -#ifdef EFL_BETA_API_SUPPORT - -#include <Eina.h> - -#include <lua.h> -#include <lualib.h> -#include <lauxlib.h> - #ifdef EAPI # undef EAPI #endif @@ -100,6 +92,14 @@ extern "C" { * @{ */ +#ifdef EFL_BETA_API_SUPPORT + +#include <Eina.h> + +#include <lua.h> +#include <lualib.h> +#include <lauxlib.h> + /** Opaque Elua state * * @ingroup Elua diff --git a/src/lib/elua/cache.c b/src/lib/elua/cache.c index c731b0495a..b18d690569 100644 --- a/src/lib/elua/cache.c +++ b/src/lib/elua/cache.c @@ -1,10 +1,10 @@ +#include "elua_private.h" + #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> #include <unistd.h> -#include "elua_private.h" - /* bytecode caching */ static Eina_File * diff --git a/src/lib/elua/io.c b/src/lib/elua/io.c index 142f61b716..77ac3df94c 100644 --- a/src/lib/elua/io.c +++ b/src/lib/elua/io.c @@ -1,9 +1,9 @@ +#include "elua_private.h" + #ifdef _WIN32 # include <evil_private.h> /* realpath */ #endif -#include "elua_private.h" - /* expand fname to full path name (so that PATH is ignored) plus turn * stuff into a command, and also verify whether the path exists */ static char * diff --git a/src/lib/elua/meson.build b/src/lib/elua/meson.build index df1acc082a..227d211584 100644 --- a/src/lib/elua/meson.build +++ b/src/lib/elua/meson.build @@ -4,14 +4,12 @@ elua_pub_deps = [lua] elua_src = ['elua.c', 'io.c', 'cache.c'] elua_header_src = ['Elua.h'] -elua_c_args = package_c_args + [ '-DEFL_BUILD' ] - elua_lib = library('elua', elua_src, - c_args : elua_c_args, dependencies: [m, dl] + elua_deps + elua_pub_deps, include_directories : config_dir + [include_directories(join_paths('..','..'))], install: true, + c_args : package_c_args, version : meson.project_version() ) diff --git a/src/lib/embryo/embryo_main.c b/src/lib/embryo/embryo_main.c index 452a272787..852b1903f2 100644 --- a/src/lib/embryo/embryo_main.c +++ b/src/lib/embryo/embryo_main.c @@ -6,8 +6,6 @@ #include <stdlib.h> #include <time.h> -#include <Eina.h> - #include "Embryo.h" #include "embryo_private.h" diff --git a/src/lib/embryo/embryo_private.h b/src/lib/embryo/embryo_private.h index e63351b2c7..4bf8ceb2c6 100644 --- a/src/lib/embryo/embryo_private.h +++ b/src/lib/embryo/embryo_private.h @@ -1,6 +1,8 @@ #ifndef _EMBRYO_PRIVATE_H #define _EMBRYO_PRIVATE_H +#include <Eina.h> + typedef enum _Embryo_Opcode Embryo_Opcode; enum _Embryo_Opcode diff --git a/src/lib/embryo/embryo_str.c b/src/lib/embryo/embryo_str.c index 6fafa83db0..d7da4e0dd3 100644 --- a/src/lib/embryo/embryo_str.c +++ b/src/lib/embryo/embryo_str.c @@ -16,8 +16,6 @@ #include <string.h> #include <fnmatch.h> -#include <Eina.h> - #include "Embryo.h" #include "embryo_private.h" diff --git a/src/lib/embryo/meson.build b/src/lib/embryo/meson.build index 21193698c0..6ab8af8fe7 100644 --- a/src/lib/embryo/meson.build +++ b/src/lib/embryo/meson.build @@ -19,14 +19,12 @@ embryo_src = [ embryo_deps = [eina, m] -embryo_c_args = package_c_args + [ '-DEFL_BUILD' ] - embryo_lib = library('embryo', embryo_src, - c_args : embryo_c_args, dependencies: [m, buildsystem] + embryo_deps, include_directories : config_dir + [include_directories(join_paths('..','..'))], install: true, + c_args : package_c_args, version : meson.project_version() ) diff --git a/src/lib/emile/meson.build b/src/lib/emile/meson.build index e894dd20ac..4ae888c42a 100644 --- a/src/lib/emile/meson.build +++ b/src/lib/emile/meson.build @@ -23,11 +23,8 @@ elif (get_option('crypto') == 'openssl') emile_src += 'emile_cipher_openssl.c' endif -emile_c_args = [ '-DEFL_BUILD' ] - emile_lib = library('emile', emile_src, - c_args : emile_c_args, include_directories: config_dir, dependencies: emile_pub_deps + emile_deps + [lz4, rg_etc, m], install: true, diff --git a/src/lib/emotion/meson.build b/src/lib/emotion/meson.build index 0dd07f845c..6f2717dfa6 100644 --- a/src/lib/emotion/meson.build +++ b/src/lib/emotion/meson.build @@ -44,17 +44,17 @@ if get_option('eeze') == true emotion_deps += [eeze] endif -emotion_c_args = package_c_args + [ '-DEFL_BUILD' ] - emotion_lib = library('emotion', emotion_src, pub_eo_file_target, priv_eo_file_target, dependencies: emotion_deps + emotion_pub_deps, include_directories : config_dir + [include_directories('.')], install: true, - c_args : emotion_c_args, + c_args : package_c_args, version : meson.project_version() ) +emotion_package_c_args = package_c_args + emotion = declare_dependency( include_directories: [include_directories('.')], link_with: emotion_lib, diff --git a/src/lib/eo/meson.build b/src/lib/eo/meson.build index 8e7b3b8bc2..83eedb0de7 100644 --- a/src/lib/eo/meson.build +++ b/src/lib/eo/meson.build @@ -58,23 +58,18 @@ endforeach eolian_include_directories += ['-I', meson.current_source_dir()] -eo_c_args = [ '-DEFL_BUILD' ] - eo_lib = library('eo', eo_src, pub_eo_file_target, - c_args : eo_c_args, dependencies: [eina, valgrind, dl, execinfo], install: true, version : meson.project_version() ) -eo_db_c_args = eo_c_args + [ '-DEO_DEBUG' ] - eo_lib_dbg = library('eo_dbg', eo_src, pub_eo_file_target, - c_args : eo_c_args, dependencies: [eina, valgrind, dl, execinfo], install: true, + c_args : '-DEO_DEBUG', version : meson.project_version() ) diff --git a/src/lib/eolian/meson.build b/src/lib/eolian/meson.build index cdc5af7d9e..083d5cdaa5 100644 --- a/src/lib/eolian/meson.build +++ b/src/lib/eolian/meson.build @@ -35,13 +35,11 @@ eolian_src = [ 'eolian_aux.c' ] -eolian_c_args = package_c_args + [ '-DEFL_BUILD' ] - eolian_lib = library('eolian', eolian_src, include_directories: config_dir, dependencies: eina, install: true, - c_args : eolian_c_args, + c_args : package_c_args, version : meson.project_version() ) diff --git a/src/lib/ephysics/meson.build b/src/lib/ephysics/meson.build index 158afa73e3..ad1a168ae5 100644 --- a/src/lib/ephysics/meson.build +++ b/src/lib/ephysics/meson.build @@ -20,14 +20,12 @@ ephysics_src = [ 'ephysics_world.cpp' ] -ephysics_c_args = package_c_args + [ '-DEFL_BUILD' ] - ephysics_lib = library('ephysics', ephysics_src, dependencies: ephysics_pub_deps + [m] + ephysics_deps, include_directories : config_dir + [include_directories('.')], install: true, - c_args : ephysics_c_args, + c_args : package_c_args, version : meson.project_version() ) diff --git a/src/lib/ethumb/meson.build b/src/lib/ethumb/meson.build index 0495a53f3c..ffc62e91e5 100644 --- a/src/lib/ethumb/meson.build +++ b/src/lib/ethumb/meson.build @@ -12,14 +12,12 @@ ethumb_src = [ ethumb_deps = [eet, evas, ecore, ecore_evas, ecore_file, ecore_imf, edje, emile] ethumb_pub_deps = [eina, eo, efl] -ethumb_c_args = package_c_args + [ '-DEFL_BUILD' ] - ethumb_lib = library('ethumb', ethumb_src, dependencies: ethumb_pub_deps + [m] + ethumb_deps, include_directories : config_dir + [include_directories('.')], install: true, - c_args : ethumb_c_args, + c_args : package_c_args, version : meson.project_version() ) diff --git a/src/lib/ethumb_client/meson.build b/src/lib/ethumb_client/meson.build index e05f0f4ba2..bddbab1d8d 100644 --- a/src/lib/ethumb_client/meson.build +++ b/src/lib/ethumb_client/meson.build @@ -13,14 +13,12 @@ ethumb_client_deps = [ ethumb_client_pub_deps = [eina, eo, efl, ethumb] -ethumb_client_c_args = package_c_args + [ '-DEFL_BUILD' ] - ethumb_client_lib = library('ethumb_client', ethumb_client_src, dependencies: ethumb_client_pub_deps + ethumb_client_deps, include_directories : config_dir + [include_directories('.')], install: true, - c_args : ethumb_client_c_args, + c_args : package_c_args, version : meson.project_version() ) diff --git a/src/lib/evas/meson.build b/src/lib/evas/meson.build index 61387dce7d..a83a5e73e0 100644 --- a/src/lib/evas/meson.build +++ b/src/lib/evas/meson.build @@ -279,16 +279,13 @@ foreach loader : evas_vg_savers_file endif endforeach -evas_c_args = [ '-DPACKAGE_DATA_DIR="'+join_paths(dir_data, 'evas')+'"' ] -evas_c_args += [ '-DEFL_BUILD' ] - evas_lib = library('evas', include_directories: evas_include_directories + [vg_common_inc_dir], sources : [evas_src, pub_eo_file_target, priv_eo_file_target], dependencies: [evas_deps, m, draw, valgrind, libunibreak, evas_static_list], link_with: evas_link, install: true, - c_args : evas_c_args, + c_args : '-DPACKAGE_DATA_DIR="'+join_paths(dir_data, 'evas')+'"', version : meson.project_version() ) diff --git a/src/lib/evil/meson.build b/src/lib/evil/meson.build index 87a7d4c8e4..4769e58054 100644 --- a/src/lib/evil/meson.build +++ b/src/lib/evil/meson.build @@ -23,10 +23,7 @@ if target_machine.system() == 'windows' secur32 = cc.find_library('secur32') uuid = cc.find_library('uuid') - evil_c_args = [ '-DEFL_BUILD' ] - evil_lib = library('evil', evil_src, - c_args : evil_c_args, dependencies : [psapi, ole32, ws2_32, secur32, uuid, regexp], include_directories : [config_dir], install: true, diff --git a/src/modules/ecore_evas/engines/extn/meson.build b/src/modules/ecore_evas/engines/extn/meson.build index 27ab19a2e7..901a126f52 100644 --- a/src/modules/ecore_evas/engines/extn/meson.build +++ b/src/modules/ecore_evas/engines/extn/meson.build @@ -1,10 +1,7 @@ engine_src = files(['ecore_evas_extn.c', 'ecore_evas_extn_buf.c', 'ecore_evas_extn_engine.h']) engine_deps = [ecore_input, ecore_ipc] -ecore_evas_mod_extn_c_args = [ '-DEFL_BUILD' ] - shared_module(mod_full_name, engine_src, - c_args : ecore_evas_mod_extn_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 6d741a7bdb..94b990df92 100644 --- a/src/modules/ecore_evas/engines/sdl/meson.build +++ b/src/modules/ecore_evas/engines/sdl/meson.build @@ -1,10 +1,7 @@ engine_src = files(['ecore_evas_sdl.c']) engine_deps = [ecore_sdl, ecore_input, ecore, dependency('sdl2')] -ecore_evas_mod_sdl_c_args = [ '-DEFL_BUILD' ] - shared_module(mod_full_name, engine_src, - c_args : ecore_evas_mod_sdl_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 4f0889317b..65fbfc1bb1 100644 --- a/src/modules/ecore_evas/engines/win32/meson.build +++ b/src/modules/ecore_evas/engines/win32/meson.build @@ -5,10 +5,7 @@ config_h.set('BUILD_ECORE_EVAS_SOFTWARE_GDI', '1') engine_deps = [engine_software_ddraw, engine_software_gdi] -ecore_evas_mod_win32_c_args = [ '-DEFL_BUILD' ] - shared_module(mod_full_name, engine_src, - c_args : ecore_evas_mod_win32_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 3ae23ac0ee..f949d07671 100644 --- a/src/modules/elementary/access_output/meson.build +++ b/src/modules/elementary/access_output/meson.build @@ -2,11 +2,8 @@ src = files([ 'mod.c', ]) -elm_mod_access_output_c_args = [ '-DEFL_BUILD' ] - shared_module(mod, src, - c_args : elm_mod_access_output_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 92574e19aa..f36adf2965 100644 --- a/src/modules/elementary/prefs/meson.build +++ b/src/modules/elementary/prefs/meson.build @@ -16,11 +16,8 @@ src = files([ 'elm_horizontal_frame.c' ]) -elm_mod_prefs_c_args = [ '-DEFL_BUILD' ] - shared_module(mod, src, - c_args : elm_mod_prefs_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 e7823d11f8..f949d07671 100644 --- a/src/modules/elementary/test_entry/meson.build +++ b/src/modules/elementary/test_entry/meson.build @@ -2,11 +2,8 @@ src = files([ 'mod.c', ]) -elm_mod_test_entry_c_args = [ '-DEFL_BUILD' ] - shared_module(mod, src, - c_args : elm_mod_test_entry_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 fbc67aa379..f949d07671 100644 --- a/src/modules/elementary/test_map/meson.build +++ b/src/modules/elementary/test_map/meson.build @@ -2,11 +2,8 @@ src = files([ 'mod.c', ]) -elm_mod_test_map_c_args = [ '-DEFL_BUILD' ] - shared_module(mod, src, - c_args : elm_mod_test_map_c_args, dependencies: [elementary], install: true, install_dir : mod_install_dir, diff --git a/src/modules/emotion/gstreamer1/meson.build b/src/modules/emotion/gstreamer1/meson.build index 8a3989f6e5..5d09a46b90 100644 --- a/src/modules/emotion/gstreamer1/meson.build +++ b/src/modules/emotion/gstreamer1/meson.build @@ -15,14 +15,12 @@ generic_deps = [ dependency('gstreamer-pbutils-1.0'), ] -emotion_mod_gst_c_args = package_c_args + [ '-DEFL_BUILD' ] - shared_module(emotion_loader, generic_src, include_directories : config_dir, dependencies: [eina, evas, emotion, generic_deps], install: true, install_dir : mod_install_dir, - c_args : emotion_mod_gst_c_args, + c_args : package_c_args, name_suffix : sys_mod_extension ) diff --git a/src/modules/ethumb/emotion/meson.build b/src/modules/ethumb/emotion/meson.build index bc11eeb7a4..610b9e9e7c 100644 --- a/src/modules/ethumb/emotion/meson.build +++ b/src/modules/ethumb/emotion/meson.build @@ -22,14 +22,12 @@ endforeach generic_src = [files(['emotion.c']) + themes] -ethumb_mod_emotion_c_args = package_c_args + [ '-DEFL_BUILD' ] - shared_module(emotion_loader+'_el', generic_src, include_directories : config_dir, dependencies: [ethumb, edje, eina, eo, eet, ecore_file, ecore, evas, ecore_evas, emotion], install: true, install_dir : mod_install_dir, - c_args : ethumb_mod_emotion_c_args, + c_args : package_c_args, name_suffix : sys_mod_extension ) diff --git a/src/modules/evas/engines/buffer/meson.build b/src/modules/evas/engines/buffer/meson.build index 369722f6f2..8c6a071e77 100644 --- a/src/modules/evas/engines/buffer/meson.build +++ b/src/modules/evas/engines/buffer/meson.build @@ -9,14 +9,11 @@ engine_deps = [] evas_include_directories += include_directories('.') -evas_mod_buffer_c_args = [ '-DEFL_BUILD' ] - install_headers('Evas_Engine_Buffer.h', install_dir : join_paths(dir_include, 'evas-'+version_major), ) evas_engine_buffer_mod = shared_module(mod_full_name, engine_src, - c_args : evas_mod_buffer_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 8774908feb..9b742757fa 100644 --- a/src/modules/evas/engines/software_ddraw/meson.build +++ b/src/modules/evas/engines/software_ddraw/meson.build @@ -7,13 +7,9 @@ engine_src = files([ engine_deps = [cc.find_library('ddraw')] -evas_mod_software_ddraw_c_args = [ '-DEFL_BUILD' ] -evas_mod_software_ddraw_cpp_args = ['-fno-rtti', '-fno-exceptions'] - shared_module(mod_full_name, engine_src, - c_args: evas_mod_software_ddraw_c_args, - cpp_args: evas_mod_software_ddraw_cpp_args, 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, diff --git a/src/modules/evas/engines/software_gdi/meson.build b/src/modules/evas/engines/software_gdi/meson.build index f9ee04fd1c..ef7a0aa690 100644 --- a/src/modules/evas/engines/software_gdi/meson.build +++ b/src/modules/evas/engines/software_gdi/meson.build @@ -7,10 +7,7 @@ engine_src = files([ engine_deps = [cc.find_library('gdi32')] -evas_mod_software_gdi_c_args = [ '-DEFL_BUILD' ] - shared_module(mod_full_name, engine_src, - c_args: evas_mod_software_gdi_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 39be8e3563..7a339b44c5 100644 --- a/src/modules/evas/image_loaders/meson.build +++ b/src/modules/evas/image_loaders/meson.build @@ -9,7 +9,6 @@ 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: [ '-DEFL_BUILD' ], 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 db23ec37d4..6e1e346d06 100644 --- a/src/modules/evas/image_savers/meson.build +++ b/src/modules/evas/image_savers/meson.build @@ -9,7 +9,6 @@ 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: [ '-DEFL_BUILD' ], include_directories : config_dir, dependencies : [eina, evas] + loader_deps, install : true, --
