summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2020-05-18 09:48:17 +0100
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2020-05-18 09:51:48 +0100
commit3ade45cbc82bea1772c7ad1afb7e1ba5dd67d930 (patch)
tree3b3b3329e8419ddb8021ddc4cca2f52d391b939d /src
parentfe56edae3f5015c62e319d5e2ab2552d3533eead (diff)
Fix EAPI definition by defining EFL_BUILD for each built DLL
Summary: EAPI must be defined to dllexport when building DLL, and to dllimport when using these DLL. To achieve this, define EFL_BUILD for each library and module, and set DLL_EXPORT unconditionally. Static library are and will be not supported Test Plan: compilation Reviewers: zmike, raster, jptiz Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D11834
Diffstat (limited to '')
-rw-r--r--src/benchmarks/eina/meson.build2
-rw-r--r--src/benchmarks/elementary/meson.build1
-rw-r--r--src/edje_external/elementary/meson.build2
-rw-r--r--src/edje_external/emotion/meson.build2
-rw-r--r--src/lib/ecore/meson.build4
-rw-r--r--src/lib/ecore_audio/meson.build3
-rw-r--r--src/lib/ecore_con/meson.build4
-rw-r--r--src/lib/ecore_evas/meson.build2
-rw-r--r--src/lib/ecore_file/meson.build2
-rw-r--r--src/lib/ecore_imf/meson.build3
-rw-r--r--src/lib/ecore_imf_evas/meson.build4
-rw-r--r--src/lib/ecore_input/meson.build2
-rw-r--r--src/lib/ecore_input_evas/ecore_input_evas.c4
-rw-r--r--src/lib/ecore_input_evas/meson.build2
-rw-r--r--src/lib/ecore_ipc/meson.build3
-rw-r--r--src/lib/ecore_sdl/meson.build4
-rw-r--r--src/lib/ecore_win32/meson.build4
-rw-r--r--src/lib/ector/meson.build3
-rw-r--r--src/lib/edje/meson.build4
-rw-r--r--src/lib/eet/meson.build3
-rw-r--r--src/lib/efl/meson.build3
-rw-r--r--src/lib/efreet/meson.build8
-rw-r--r--src/lib/eina/meson.build3
-rw-r--r--src/lib/eio/meson.build4
-rw-r--r--src/lib/eldbus/meson.build3
-rw-r--r--src/lib/elementary/Efl_Ui.h7
-rw-r--r--src/lib/elementary/meson.build6
-rw-r--r--src/lib/elua/Elua.h16
-rw-r--r--src/lib/elua/cache.c4
-rw-r--r--src/lib/elua/io.c4
-rw-r--r--src/lib/elua/meson.build4
-rw-r--r--src/lib/embryo/embryo_main.c2
-rw-r--r--src/lib/embryo/embryo_private.h2
-rw-r--r--src/lib/embryo/embryo_str.c2
-rw-r--r--src/lib/embryo/meson.build4
-rw-r--r--src/lib/emile/meson.build3
-rw-r--r--src/lib/emotion/meson.build6
-rw-r--r--src/lib/eo/meson.build7
-rw-r--r--src/lib/eolian/meson.build4
-rw-r--r--src/lib/ephysics/meson.build4
-rw-r--r--src/lib/ethumb/meson.build4
-rw-r--r--src/lib/ethumb_client/meson.build4
-rw-r--r--src/lib/evas/meson.build5
-rw-r--r--src/lib/evil/meson.build3
-rw-r--r--src/modules/ecore_evas/engines/extn/meson.build3
-rw-r--r--src/modules/ecore_evas/engines/sdl/meson.build3
-rw-r--r--src/modules/ecore_evas/engines/win32/meson.build3
-rw-r--r--src/modules/elementary/access_output/meson.build3
-rw-r--r--src/modules/elementary/prefs/meson.build3
-rw-r--r--src/modules/elementary/test_entry/meson.build3
-rw-r--r--src/modules/elementary/test_map/meson.build3
-rw-r--r--src/modules/emotion/gstreamer1/meson.build4
-rw-r--r--src/modules/ethumb/emotion/meson.build4
-rw-r--r--src/modules/evas/engines/buffer/meson.build3
-rw-r--r--src/modules/evas/engines/software_ddraw/meson.build6
-rw-r--r--src/modules/evas/engines/software_gdi/meson.build3
-rw-r--r--src/modules/evas/image_loaders/meson.build1
-rw-r--r--src/modules/evas/image_savers/meson.build1
58 files changed, 158 insertions, 55 deletions
diff --git a/src/benchmarks/eina/meson.build b/src/benchmarks/eina/meson.build
index 9b924dd1b9..2c3d40013e 100644
--- a/src/benchmarks/eina/meson.build
+++ b/src/benchmarks/eina/meson.build
@@ -31,7 +31,7 @@ city = shared_library('city',
31eina_bench = executable('eina_bench', 31eina_bench = executable('eina_bench',
32 sources : eina_bench_src, 32 sources : eina_bench_src,
33 dependencies : eina, 33 dependencies : eina,
34 c_args : ['-fPIC','-DCITYHASH_BENCH', '-DEINA_ENABLE_BENCH_E17'], 34 c_args: ['-fPIC','-DCITYHASH_BENCH', '-DEINA_ENABLE_BENCH_E17', '-DEFL_BUILD'],
35 include_directories : config_dir, 35 include_directories : config_dir,
36 link_with : city, 36 link_with : city,
37) 37)
diff --git a/src/benchmarks/elementary/meson.build b/src/benchmarks/elementary/meson.build
index 8cb1b99057..d174a93433 100644
--- a/src/benchmarks/elementary/meson.build
+++ b/src/benchmarks/elementary/meson.build
@@ -10,6 +10,7 @@ benchmark('focus_widget_tree', focus_widget_tree_bench,
10 10
11item_container = executable('collection', 11item_container = executable('collection',
12 'collection.c', 12 'collection.c',
13 c_args: ['-DEFL_BUILD'],
13 dependencies: [elementary, ecore_input_evas, eio], 14 dependencies: [elementary, ecore_input_evas, eio],
14) 15)
15 16
diff --git a/src/edje_external/elementary/meson.build b/src/edje_external/elementary/meson.build
index 033b54eab8..3c716331c1 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',
45 dependencies: [edje, elementary, elementary_deps], 45 dependencies: [edje, elementary, elementary_deps],
46 install: true, 46 install: true,
47 install_dir: mod_install_dir, 47 install_dir: mod_install_dir,
48 c_args : elm_package_c_args, 48 c_args : package_c_args,
49 name_suffix : sys_mod_extension 49 name_suffix : sys_mod_extension
50) 50)
51module_files += join_paths(mod_install_dir, 'libelementary.' + sys_mod_extension) 51module_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 5d869d8b7a..6e3a6836b6 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',
3 dependencies: [edje, emotion], 3 dependencies: [edje, emotion],
4 install: true, 4 install: true,
5 install_dir: mod_install_dir, 5 install_dir: mod_install_dir,
6 c_args : emotion_package_c_args, 6 c_args : package_c_args,
7 name_suffix : sys_mod_extension 7 name_suffix : sys_mod_extension
8) 8)
9module_files += join_paths(mod_install_dir, 'libemotion.' + sys_mod_extension) 9module_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 637761dcc4..3c7bb8834f 100644
--- a/src/lib/ecore/meson.build
+++ b/src/lib/ecore/meson.build
@@ -192,12 +192,14 @@ if get_option('g-mainloop') == true
192 endif 192 endif
193endif 193endif
194 194
195ecore_c_args = package_c_args + [ '-DEFL_BUILD' ]
196
195ecore_lib = library('ecore', 197ecore_lib = library('ecore',
196 ecore_src, pub_eo_file_target, 198 ecore_src, pub_eo_file_target,
199 c_args : ecore_c_args,
197 dependencies: ecore_pub_deps + [m, buildsystem, ecore_deps], 200 dependencies: ecore_pub_deps + [m, buildsystem, ecore_deps],
198 include_directories : config_dir + [include_directories(join_paths('..','..'))], 201 include_directories : config_dir + [include_directories(join_paths('..','..'))],
199 install: true, 202 install: true,
200 c_args : package_c_args,
201 version : meson.project_version() 203 version : meson.project_version()
202) 204)
203 205
diff --git a/src/lib/ecore_audio/meson.build b/src/lib/ecore_audio/meson.build
index c03eb3e663..d3b0b12e8d 100644
--- a/src/lib/ecore_audio/meson.build
+++ b/src/lib/ecore_audio/meson.build
@@ -77,8 +77,11 @@ if sys_windows == true
77 ecore_audio_deps += [cc.find_library('ksuser', required: true), cc.find_library('winmm', required: true)] 77 ecore_audio_deps += [cc.find_library('ksuser', required: true), cc.find_library('winmm', required: true)]
78endif 78endif
79 79
80ecore_audio_c_args = [ '-DEFL_BUILD' ]
81
80ecore_audio_lib = library('ecore_audio', 82ecore_audio_lib = library('ecore_audio',
81 ecore_audio_src, pub_eo_file_target, 83 ecore_audio_src, pub_eo_file_target,
84 c_args : ecore_audio_c_args,
82 dependencies: ecore_audio_pub_deps + [m] + ecore_audio_deps, 85 dependencies: ecore_audio_pub_deps + [m] + ecore_audio_deps,
83 include_directories : config_dir, 86 include_directories : config_dir,
84 install: true, 87 install: true,
diff --git a/src/lib/ecore_con/meson.build b/src/lib/ecore_con/meson.build
index 44faa486af..bd6562e0b2 100644
--- a/src/lib/ecore_con/meson.build
+++ b/src/lib/ecore_con/meson.build
@@ -182,12 +182,14 @@ endif
182 182
183ecore_con_deps += crypto 183ecore_con_deps += crypto
184 184
185ecore_con_c_args = package_c_args + [ '-DEFL_BUILD' ]
186
185ecore_con_lib = library('ecore_con', 187ecore_con_lib = library('ecore_con',
186 ecore_con_src, pub_eo_file_target, 188 ecore_con_src, pub_eo_file_target,
187 dependencies: [ecore, ecore_con_deps, http_parser, eldbus, eet, buildsystem, dl], 189 dependencies: [ecore, ecore_con_deps, http_parser, eldbus, eet, buildsystem, dl],
188 include_directories : config_dir, 190 include_directories : config_dir,
189 install: true, 191 install: true,
190 c_args : package_c_args, 192 c_args : ecore_con_c_args,
191 version : meson.project_version() 193 version : meson.project_version()
192) 194)
193 195
diff --git a/src/lib/ecore_evas/meson.build b/src/lib/ecore_evas/meson.build
index 890e3c42b3..7d2018ca32 100644
--- a/src/lib/ecore_evas/meson.build
+++ b/src/lib/ecore_evas/meson.build
@@ -27,9 +27,11 @@ ecore_evas_src = [
27 'ecore_evas_fallback_selection.c' 27 'ecore_evas_fallback_selection.c'
28] 28]
29 29
30ecore_evas_c_args = [ '-DEFL_BUILD' ]
30 31
31ecore_evas_lib = library('ecore_evas', 32ecore_evas_lib = library('ecore_evas',
32 ecore_evas_src, pub_eo_file_target, 33 ecore_evas_src, pub_eo_file_target,
34 c_args: ecore_evas_c_args,
33 dependencies: [ecore_evas_deps, buildsystem], 35 dependencies: [ecore_evas_deps, buildsystem],
34 include_directories : config_dir, 36 include_directories : config_dir,
35 install: true, 37 install: true,
diff --git a/src/lib/ecore_file/meson.build b/src/lib/ecore_file/meson.build
index 727c3d372c..8cf9b23e57 100644
--- a/src/lib/ecore_file/meson.build
+++ b/src/lib/ecore_file/meson.build
@@ -19,9 +19,11 @@ endif
19 19
20ecore_file_header_src = ['Ecore_File.h'] 20ecore_file_header_src = ['Ecore_File.h']
21 21
22ecore_file_c_args = [ '-DEFL_BUILD' ]
22 23
23ecore_file_lib = library('ecore_file', 24ecore_file_lib = library('ecore_file',
24 ecore_file_src, 25 ecore_file_src,
26 c_args : ecore_file_c_args,
25 dependencies: ecore_file_deps + ecore_file_pub_deps + ecore_file_deps, 27 dependencies: ecore_file_deps + ecore_file_pub_deps + ecore_file_deps,
26 include_directories : config_dir + [include_directories(join_paths('..','..'))], 28 include_directories : config_dir + [include_directories(join_paths('..','..'))],
27 install: true, 29 install: true,
diff --git a/src/lib/ecore_imf/meson.build b/src/lib/ecore_imf/meson.build
index 978594d20a..1dd94241e4 100644
--- a/src/lib/ecore_imf/meson.build
+++ b/src/lib/ecore_imf/meson.build
@@ -12,12 +12,13 @@ ecore_imf_src = [
12 'ecore_imf_private.h', 12 'ecore_imf_private.h',
13] 13]
14 14
15ecore_imf_c_args = package_c_args + [ '-DEFL_BUILD' ]
15 16
16ecore_imf_lib = library('ecore_imf', 17ecore_imf_lib = library('ecore_imf',
17 ecore_imf_src, pub_eo_file_target, 18 ecore_imf_src, pub_eo_file_target,
18 dependencies: [buildsystem, ecore_imf_deps, ecore_imf_pub_deps], 19 dependencies: [buildsystem, ecore_imf_deps, ecore_imf_pub_deps],
19 include_directories : config_dir, 20 include_directories : config_dir,
20 c_args : package_c_args, 21 c_args : ecore_imf_c_args,
21 install: true, 22 install: true,
22 version : meson.project_version() 23 version : meson.project_version()
23) 24)
diff --git a/src/lib/ecore_imf_evas/meson.build b/src/lib/ecore_imf_evas/meson.build
index 28d53ea78d..5245a8871f 100644
--- a/src/lib/ecore_imf_evas/meson.build
+++ b/src/lib/ecore_imf_evas/meson.build
@@ -9,12 +9,14 @@ ecore_imf_evas_src = [
9ecore_imf_evas_deps = [ecore_imf, evas] 9ecore_imf_evas_deps = [ecore_imf, evas]
10ecore_imf_evas_pub_deps = [eina, eo, efl] 10ecore_imf_evas_pub_deps = [eina, eo, efl]
11 11
12ecore_imf_evas_c_args = package_c_args + [ '-DEFL_BUILD' ]
13
12ecore_imf_evas_lib = library('ecore_imf_evas', 14ecore_imf_evas_lib = library('ecore_imf_evas',
13 ecore_imf_evas_src, 15 ecore_imf_evas_src,
14 dependencies: ecore_imf_evas_pub_deps + [m] + ecore_imf_evas_deps, 16 dependencies: ecore_imf_evas_pub_deps + [m] + ecore_imf_evas_deps,
15 include_directories : config_dir + [include_directories('.')], 17 include_directories : config_dir + [include_directories('.')],
16 install: true, 18 install: true,
17 c_args : package_c_args, 19 c_args : ecore_imf_evas_c_args,
18 version : meson.project_version() 20 version : meson.project_version()
19) 21)
20 22
diff --git a/src/lib/ecore_input/meson.build b/src/lib/ecore_input/meson.build
index c57ec4e04c..745d5b5d83 100644
--- a/src/lib/ecore_input/meson.build
+++ b/src/lib/ecore_input/meson.build
@@ -17,9 +17,11 @@ if get_option('eeze')
17 ecore_input_deps += eeze 17 ecore_input_deps += eeze
18endif 18endif
19 19
20ecore_input_c_args = [ '-DEFL_BUILD' ]
20 21
21ecore_input_lib = library('ecore_input', 22ecore_input_lib = library('ecore_input',
22 ecore_input_src, pub_eo_file_target, 23 ecore_input_src, pub_eo_file_target,
24 c_args: ecore_input_c_args,
23 dependencies: ecore_input_pub_deps + ecore_input_deps, 25 dependencies: ecore_input_pub_deps + ecore_input_deps,
24 include_directories : config_dir, 26 include_directories : config_dir,
25 install: true, 27 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 8f26737778..ea07300e7a 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 @@
7#include <string.h> 7#include <string.h>
8#include <stdlib.h> 8#include <stdlib.h>
9 9
10#include "Ecore.h" 10#include <Ecore.h>
11#include "Ecore_Input.h" 11#include <Ecore_Input.h>
12 12
13#include "Ecore_Input_Evas.h" 13#include "Ecore_Input_Evas.h"
14#include "ecore_input_evas_private.h" 14#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 8b48142f7d..5deb298796 100644
--- a/src/lib/ecore_input_evas/meson.build
+++ b/src/lib/ecore_input_evas/meson.build
@@ -11,9 +11,11 @@ ecore_input_evas_src = [
11 'ecore_input_evas_private.h', 11 'ecore_input_evas_private.h',
12] 12]
13 13
14ecore_input_evas_c_args = [ '-DEFL_BUILD' ]
14 15
15ecore_input_evas_lib = library('ecore_input_evas', 16ecore_input_evas_lib = library('ecore_input_evas',
16 ecore_input_evas_src, pub_eo_file_target, 17 ecore_input_evas_src, pub_eo_file_target,
18 c_args : ecore_input_evas_c_args,
17 dependencies: ecore_input_evas_pub_deps + ecore_input_evas_deps, 19 dependencies: ecore_input_evas_pub_deps + ecore_input_evas_deps,
18 include_directories : config_dir, 20 include_directories : config_dir,
19 install: true, 21 install: true,
diff --git a/src/lib/ecore_ipc/meson.build b/src/lib/ecore_ipc/meson.build
index dbc95b0531..c7fa2480c5 100644
--- a/src/lib/ecore_ipc/meson.build
+++ b/src/lib/ecore_ipc/meson.build
@@ -10,8 +10,11 @@ ecore_ipc_src = [
10 'ecore_ipc_private.h', 10 'ecore_ipc_private.h',
11] 11]
12 12
13ecore_ipc_c_args = [ '-DEFL_BUILD' ]
14
13ecore_ipc_lib = library('ecore_ipc', 15ecore_ipc_lib = library('ecore_ipc',
14 ecore_ipc_src, pub_eo_file_target, 16 ecore_ipc_src, pub_eo_file_target,
17 c_args : ecore_ipc_c_args,
15 dependencies: ecore_ipc_deps + ecore_ipc_pub_deps, 18 dependencies: ecore_ipc_deps + ecore_ipc_pub_deps,
16 include_directories : config_dir, 19 include_directories : config_dir,
17 install: true, 20 install: true,
diff --git a/src/lib/ecore_sdl/meson.build b/src/lib/ecore_sdl/meson.build
index b4685818c1..9aa9bbdbd5 100644
--- a/src/lib/ecore_sdl/meson.build
+++ b/src/lib/ecore_sdl/meson.build
@@ -12,12 +12,14 @@ ecore_sdl_header_src = [
12 12
13ecore_sdl_deps += dependency('sdl2') 13ecore_sdl_deps += dependency('sdl2')
14 14
15ecore_sdl_c_args = package_c_args + [ '-DEFL_BUILD' ]
16
15ecore_sdl_lib = library('ecore_sdl', 17ecore_sdl_lib = library('ecore_sdl',
16 ecore_sdl_src, 18 ecore_sdl_src,
17 dependencies: [m] + ecore_sdl_deps + ecore_sdl_pub_deps, 19 dependencies: [m] + ecore_sdl_deps + ecore_sdl_pub_deps,
18 include_directories : config_dir + [include_directories(join_paths('..','..'))], 20 include_directories : config_dir + [include_directories(join_paths('..','..'))],
19 install: true, 21 install: true,
20 c_args : package_c_args, 22 c_args : ecore_sdl_c_args,
21) 23)
22 24
23ecore_sdl = declare_dependency( 25ecore_sdl = declare_dependency(
diff --git a/src/lib/ecore_win32/meson.build b/src/lib/ecore_win32/meson.build
index 1bb4589f28..48867e6a43 100644
--- a/src/lib/ecore_win32/meson.build
+++ b/src/lib/ecore_win32/meson.build
@@ -20,12 +20,14 @@ if sys_windows == true
20 'Ecore_Win32.h' 20 'Ecore_Win32.h'
21 ] 21 ]
22 22
23 ecore_win32_c_args = package_c_args + [ '-DEFL_BUILD' ]
24
23 ecore_win32_lib = library('ecore_win32', 25 ecore_win32_lib = library('ecore_win32',
24 ecore_win32_src, 26 ecore_win32_src,
25 dependencies: ecore_win32_deps + ecore_win32_pub_deps, 27 dependencies: ecore_win32_deps + ecore_win32_pub_deps,
26 include_directories : config_dir, 28 include_directories : config_dir,
27 install: true, 29 install: true,
28 c_args : package_c_args, 30 c_args : ecore_win32_c_args,
29 ) 31 )
30 32
31 ecore_win32 = declare_dependency( 33 ecore_win32 = declare_dependency(
diff --git a/src/lib/ector/meson.build b/src/lib/ector/meson.build
index 49fc5a477f..3dac471178 100644
--- a/src/lib/ector/meson.build
+++ b/src/lib/ector/meson.build
@@ -80,8 +80,11 @@ endforeach
80 80
81subdir('software') 81subdir('software')
82 82
83ector_c_args = [ '-DEFL_BUILD' ]
84
83ector_lib = library('ector', 85ector_lib = library('ector',
84 ector_src, pub_eo_file_target, 86 ector_src, pub_eo_file_target,
87 c_args : ector_c_args,
85 dependencies: ector_pub_deps + [triangulator, freetype, draw, m] + ector_deps, 88 dependencies: ector_pub_deps + [triangulator, freetype, draw, m] + ector_deps,
86 include_directories : config_dir, 89 include_directories : config_dir,
87 install: true, 90 install: true,
diff --git a/src/lib/edje/meson.build b/src/lib/edje/meson.build
index 84b8ac7318..c2a9cf9578 100644
--- a/src/lib/edje/meson.build
+++ b/src/lib/edje/meson.build
@@ -144,12 +144,14 @@ edje_src = [
144 144
145] 145]
146 146
147edje_c_args = package_c_args + [ '-DEFL_BUILD' ]
148
147edje_lib = library('edje', 149edje_lib = library('edje',
148 edje_src, pub_eo_file_target, priv_eo_file_target, 150 edje_src, pub_eo_file_target, priv_eo_file_target,
149 dependencies: edje_pub_deps + edje_deps, 151 dependencies: edje_pub_deps + edje_deps,
150 include_directories : config_dir + [include_directories('.')], 152 include_directories : config_dir + [include_directories('.')],
151 install: true, 153 install: true,
152 c_args : [package_c_args], 154 c_args : edje_c_args,
153 version : meson.project_version() 155 version : meson.project_version()
154) 156)
155 157
diff --git a/src/lib/eet/meson.build b/src/lib/eet/meson.build
index 8ebdb48dd6..edc879405d 100644
--- a/src/lib/eet/meson.build
+++ b/src/lib/eet/meson.build
@@ -18,8 +18,11 @@ eet_src = [
18 'eet_utils.c', 18 'eet_utils.c',
19] 19]
20 20
21eet_c_args = [ '-DEFL_BUILD' ]
22
21eet_lib = library('eet', 23eet_lib = library('eet',
22 eet_src, pub_eo_file_target, 24 eet_src, pub_eo_file_target,
25 c_args : eet_c_args,
23 dependencies: eet_deps + eet_pub_deps, 26 dependencies: eet_deps + eet_pub_deps,
24 include_directories : config_dir, 27 include_directories : config_dir,
25 install: true, 28 install: true,
diff --git a/src/lib/efl/meson.build b/src/lib/efl/meson.build
index d5805be9b3..152dfb0e3c 100644
--- a/src/lib/efl/meson.build
+++ b/src/lib/efl/meson.build
@@ -11,8 +11,11 @@ efl_src = []
11subdir('interfaces') 11subdir('interfaces')
12package_header_subdirs += 'interfaces' 12package_header_subdirs += 'interfaces'
13 13
14efl_c_args = [ '-DEFL_BUILD' ]
15
14efl_lib = library('efl', 16efl_lib = library('efl',
15 efl_src, pub_eo_file_target, 17 efl_src, pub_eo_file_target,
18 c_args : efl_c_args,
16 dependencies: [eina, eo, m], 19 dependencies: [eina, eo, m],
17 install: true, 20 install: true,
18 version : meson.project_version() 21 version : meson.project_version()
diff --git a/src/lib/efreet/meson.build b/src/lib/efreet/meson.build
index f438b02845..bc3f8f8d28 100644
--- a/src/lib/efreet/meson.build
+++ b/src/lib/efreet/meson.build
@@ -31,12 +31,14 @@ efreet_src = [
31efreet_deps = [eet, ecore, ecore_con, ecore_file, eo, efl, eina, emile, ecore_ipc, buildsystem,intl] 31efreet_deps = [eet, ecore, ecore_con, ecore_file, eo, efl, eina, emile, ecore_ipc, buildsystem,intl]
32efreet_pub_deps = [eina, eo, efl] 32efreet_pub_deps = [eina, eo, efl]
33 33
34efreet_c_args = package_c_args + [ '-DEFL_BUILD' ]
35
34efreet_lib = library('efreet', 36efreet_lib = library('efreet',
35 efreet_src, 37 efreet_src,
36 dependencies: efreet_pub_deps + [m] + efreet_deps, 38 dependencies: efreet_pub_deps + [m] + efreet_deps,
37 include_directories : config_dir + [include_directories('.')], 39 include_directories : config_dir + [include_directories('.')],
38 install: true, 40 install: true,
39 c_args : [package_c_args, '-DDATA_DIR="'+dir_data+'"'], 41 c_args : [efreet_c_args, '-DDATA_DIR="'+dir_data+'"'],
40 version : meson.project_version() 42 version : meson.project_version()
41) 43)
42 44
@@ -51,7 +53,7 @@ efreet_mime_lib = library('efreet_mime',
51 dependencies: efreet_pub_deps + [m, efreet, efreet_deps], 53 dependencies: efreet_pub_deps + [m, efreet, efreet_deps],
52 include_directories : config_dir + [include_directories('.')], 54 include_directories : config_dir + [include_directories('.')],
53 install: true, 55 install: true,
54 c_args : package_c_args, 56 c_args : efreet_c_args,
55 version : meson.project_version() 57 version : meson.project_version()
56) 58)
57 59
@@ -67,7 +69,7 @@ efreet_trash_lib = library('efreet_trash',
67 dependencies: efreet_pub_deps + [efreet, efreet_deps], 69 dependencies: efreet_pub_deps + [efreet, efreet_deps],
68 include_directories : config_dir + [include_directories('.')], 70 include_directories : config_dir + [include_directories('.')],
69 install: true, 71 install: true,
70 c_args : package_c_args, 72 c_args : efreet_c_args,
71 version : meson.project_version() 73 version : meson.project_version()
72) 74)
73 75
diff --git a/src/lib/eina/meson.build b/src/lib/eina/meson.build
index ce7cfe84f1..c8dbe3904a 100644
--- a/src/lib/eina/meson.build
+++ b/src/lib/eina/meson.build
@@ -361,7 +361,10 @@ endif
361 361
362execinfo = cc.find_library('execinfo', required: false) 362execinfo = cc.find_library('execinfo', required: false)
363 363
364eina_c_args = [ '-DEFL_BUILD' ]
365
364eina_lib = library('eina', sources, 366eina_lib = library('eina', sources,
367 c_args : eina_c_args,
365 include_directories : config_dir, 368 include_directories : config_dir,
366 dependencies: [m, rt, dl, execinfo, iconv, eina_deps, thread_dep, eina_mem_pools, evil], 369 dependencies: [m, rt, dl, execinfo, iconv, eina_deps, thread_dep, eina_mem_pools, evil],
367 install: true, 370 install: true,
diff --git a/src/lib/eio/meson.build b/src/lib/eio/meson.build
index f95a1e652c..9d35187c13 100644
--- a/src/lib/eio/meson.build
+++ b/src/lib/eio/meson.build
@@ -66,12 +66,14 @@ endif
66eio_deps = [ecore, ecore_file, eet, eo, eina, efl, emile, efreet_mime] 66eio_deps = [ecore, ecore_file, eet, eo, eina, efl, emile, efreet_mime]
67eio_pub_deps = [eina, eet] 67eio_pub_deps = [eina, eet]
68 68
69eio_c_args = package_c_args + [ '-DEFL_BUILD' ]
70
69eio_lib = library('eio', 71eio_lib = library('eio',
70 eio_src, pub_eo_file_target, 72 eio_src, pub_eo_file_target,
71 dependencies: [eina, eo, efl, m, eio_deps], 73 dependencies: [eina, eo, efl, m, eio_deps],
72 include_directories : config_dir + [include_directories('.')], 74 include_directories : config_dir + [include_directories('.')],
73 install: true, 75 install: true,
74 c_args : package_c_args, 76 c_args : eio_c_args,
75 link_args : linker_args, 77 link_args : linker_args,
76 version : meson.project_version() 78 version : meson.project_version()
77) 79)
diff --git a/src/lib/eldbus/meson.build b/src/lib/eldbus/meson.build
index 054273acf8..de30aca5d7 100644
--- a/src/lib/eldbus/meson.build
+++ b/src/lib/eldbus/meson.build
@@ -94,8 +94,11 @@ eldbus_src = [
94 94
95eldbus_deps += dependency('dbus-1') 95eldbus_deps += dependency('dbus-1')
96 96
97eldbus_c_args = [ '-DEFL_BUILD' ]
98
97eldbus_lib = library('eldbus', 99eldbus_lib = library('eldbus',
98 eldbus_src, pub_eo_file_target, 100 eldbus_src, pub_eo_file_target,
101 c_args : eldbus_c_args,
99 dependencies: eldbus_pub_deps + eldbus_deps, 102 dependencies: eldbus_pub_deps + eldbus_deps,
100 include_directories : config_dir, 103 include_directories : config_dir,
101 install: true, 104 install: true,
diff --git a/src/lib/elementary/Efl_Ui.h b/src/lib/elementary/Efl_Ui.h
index ffc5fd43c5..e2d0cf6abe 100644
--- a/src/lib/elementary/Efl_Ui.h
+++ b/src/lib/elementary/Efl_Ui.h
@@ -40,13 +40,6 @@
40#include <alloca.h> 40#include <alloca.h>
41#endif 41#endif
42 42
43#ifdef ELM_WIN32
44#include <malloc.h>
45#ifndef alloca
46#define alloca _alloca
47#endif
48#endif
49
50#ifdef _WIN32 43#ifdef _WIN32
51# define WIN32_LEAN_AND_MEAN 44# define WIN32_LEAN_AND_MEAN
52# include <winsock2.h> 45# include <winsock2.h>
diff --git a/src/lib/elementary/meson.build b/src/lib/elementary/meson.build
index 29e7dfc3df..bdbc2e6ca8 100644
--- a/src/lib/elementary/meson.build
+++ b/src/lib/elementary/meson.build
@@ -962,8 +962,6 @@ config_h.set_quoted('ICON_DIR', join_paths(dir_lib, 'icons'))
962 962
963if sys_windows == false 963if sys_windows == false
964 elm_options.set('ELM_UNIX', '1') 964 elm_options.set('ELM_UNIX', '1')
965else
966 elm_options.set('DLL_EXPORT', '1')
967endif 965endif
968 966
969elm_options.set('ELM_EFREET', '1') 967elm_options.set('ELM_EFREET', '1')
@@ -1010,14 +1008,14 @@ c = configure_file(
1010 install_dir : dir_package_include, 1008 install_dir : dir_package_include,
1011 configuration: elm_options) 1009 configuration: elm_options)
1012 1010
1013elm_package_c_args = package_c_args + ['-DELEMENTARY_BUILD=1'] 1011elm_c_args = package_c_args + ['-DEFL_BUILD=1']
1014 1012
1015elementary_lib = library('elementary', 1013elementary_lib = library('elementary',
1016 elementary_src, pub_eo_file_target, priv_eo_file_target, c, embed_config, 1014 elementary_src, pub_eo_file_target, priv_eo_file_target, c, embed_config,
1017 dependencies: elementary_pub_deps + elementary_deps, 1015 dependencies: elementary_pub_deps + elementary_deps,
1018 include_directories : config_dir + [include_directories('.')] + [include_directories(join_paths('..', '..', '..'))] + [ecore_evas_wayland_engine_include_dir], 1016 include_directories : config_dir + [include_directories('.')] + [include_directories(join_paths('..', '..', '..'))] + [ecore_evas_wayland_engine_include_dir],
1019 install: true, 1017 install: true,
1020 c_args : elm_package_c_args, 1018 c_args : elm_c_args,
1021 version : meson.project_version() 1019 version : meson.project_version()
1022) 1020)
1023 1021
diff --git a/src/lib/elua/Elua.h b/src/lib/elua/Elua.h
index 289f9112d7..cf93d65e53 100644
--- a/src/lib/elua/Elua.h
+++ b/src/lib/elua/Elua.h
@@ -18,6 +18,14 @@
18#ifndef _ELUA_H 18#ifndef _ELUA_H
19#define _ELUA_H 19#define _ELUA_H
20 20
21#ifdef EFL_BETA_API_SUPPORT
22
23#include <Eina.h>
24
25#include <lua.h>
26#include <lualib.h>
27#include <lauxlib.h>
28
21#ifdef EAPI 29#ifdef EAPI
22# undef EAPI 30# undef EAPI
23#endif 31#endif
@@ -92,14 +100,6 @@ extern "C" {
92 * @{ 100 * @{
93 */ 101 */
94 102
95#ifdef EFL_BETA_API_SUPPORT
96
97#include <Eina.h>
98
99#include <lua.h>
100#include <lualib.h>
101#include <lauxlib.h>
102
103/** Opaque Elua state 103/** Opaque Elua state
104 * 104 *
105 * @ingroup Elua 105 * @ingroup Elua
diff --git a/src/lib/elua/cache.c b/src/lib/elua/cache.c
index b18d690569..c731b0495a 100644
--- a/src/lib/elua/cache.c
+++ b/src/lib/elua/cache.c
@@ -1,10 +1,10 @@
1#include "elua_private.h"
2
3#include <sys/types.h> 1#include <sys/types.h>
4#include <sys/stat.h> 2#include <sys/stat.h>
5#include <fcntl.h> 3#include <fcntl.h>
6#include <unistd.h> 4#include <unistd.h>
7 5
6#include "elua_private.h"
7
8/* bytecode caching */ 8/* bytecode caching */
9 9
10static Eina_File * 10static Eina_File *
diff --git a/src/lib/elua/io.c b/src/lib/elua/io.c
index 77ac3df94c..142f61b716 100644
--- a/src/lib/elua/io.c
+++ b/src/lib/elua/io.c
@@ -1,9 +1,9 @@
1#include "elua_private.h"
2
3#ifdef _WIN32 1#ifdef _WIN32
4# include <evil_private.h> /* realpath */ 2# include <evil_private.h> /* realpath */
5#endif 3#endif
6 4
5#include "elua_private.h"
6
7/* expand fname to full path name (so that PATH is ignored) plus turn 7/* expand fname to full path name (so that PATH is ignored) plus turn
8 * stuff into a command, and also verify whether the path exists */ 8 * stuff into a command, and also verify whether the path exists */
9static char * 9static char *
diff --git a/src/lib/elua/meson.build b/src/lib/elua/meson.build
index 227d211584..df1acc082a 100644
--- a/src/lib/elua/meson.build
+++ b/src/lib/elua/meson.build
@@ -4,12 +4,14 @@ elua_pub_deps = [lua]
4elua_src = ['elua.c', 'io.c', 'cache.c'] 4elua_src = ['elua.c', 'io.c', 'cache.c']
5elua_header_src = ['Elua.h'] 5elua_header_src = ['Elua.h']
6 6
7elua_c_args = package_c_args + [ '-DEFL_BUILD' ]
8
7elua_lib = library('elua', 9elua_lib = library('elua',
8 elua_src, 10 elua_src,
11 c_args : elua_c_args,
9 dependencies: [m, dl] + elua_deps + elua_pub_deps, 12 dependencies: [m, dl] + elua_deps + elua_pub_deps,
10 include_directories : config_dir + [include_directories(join_paths('..','..'))], 13 include_directories : config_dir + [include_directories(join_paths('..','..'))],
11 install: true, 14 install: true,
12 c_args : package_c_args,
13 version : meson.project_version() 15 version : meson.project_version()
14) 16)
15 17
diff --git a/src/lib/embryo/embryo_main.c b/src/lib/embryo/embryo_main.c
index 852b1903f2..452a272787 100644
--- a/src/lib/embryo/embryo_main.c
+++ b/src/lib/embryo/embryo_main.c
@@ -6,6 +6,8 @@
6#include <stdlib.h> 6#include <stdlib.h>
7#include <time.h> 7#include <time.h>
8 8
9#include <Eina.h>
10
9#include "Embryo.h" 11#include "Embryo.h"
10#include "embryo_private.h" 12#include "embryo_private.h"
11 13
diff --git a/src/lib/embryo/embryo_private.h b/src/lib/embryo/embryo_private.h
index 4bf8ceb2c6..e63351b2c7 100644
--- a/src/lib/embryo/embryo_private.h
+++ b/src/lib/embryo/embryo_private.h
@@ -1,8 +1,6 @@
1#ifndef _EMBRYO_PRIVATE_H 1#ifndef _EMBRYO_PRIVATE_H
2#define _EMBRYO_PRIVATE_H 2#define _EMBRYO_PRIVATE_H
3 3
4#include <Eina.h>
5
6typedef enum _Embryo_Opcode Embryo_Opcode; 4typedef enum _Embryo_Opcode Embryo_Opcode;
7 5
8enum _Embryo_Opcode 6enum _Embryo_Opcode
diff --git a/src/lib/embryo/embryo_str.c b/src/lib/embryo/embryo_str.c
index d7da4e0dd3..6fafa83db0 100644
--- a/src/lib/embryo/embryo_str.c
+++ b/src/lib/embryo/embryo_str.c
@@ -16,6 +16,8 @@
16#include <string.h> 16#include <string.h>
17#include <fnmatch.h> 17#include <fnmatch.h>
18 18
19#include <Eina.h>
20
19#include "Embryo.h" 21#include "Embryo.h"
20#include "embryo_private.h" 22#include "embryo_private.h"
21 23
diff --git a/src/lib/embryo/meson.build b/src/lib/embryo/meson.build
index 6ab8af8fe7..21193698c0 100644
--- a/src/lib/embryo/meson.build
+++ b/src/lib/embryo/meson.build
@@ -19,12 +19,14 @@ embryo_src = [
19 19
20embryo_deps = [eina, m] 20embryo_deps = [eina, m]
21 21
22embryo_c_args = package_c_args + [ '-DEFL_BUILD' ]
23
22embryo_lib = library('embryo', 24embryo_lib = library('embryo',
23 embryo_src, 25 embryo_src,
26 c_args : embryo_c_args,
24 dependencies: [m, buildsystem] + embryo_deps, 27 dependencies: [m, buildsystem] + embryo_deps,
25 include_directories : config_dir + [include_directories(join_paths('..','..'))], 28 include_directories : config_dir + [include_directories(join_paths('..','..'))],
26 install: true, 29 install: true,
27 c_args : package_c_args,
28 version : meson.project_version() 30 version : meson.project_version()
29) 31)
30 32
diff --git a/src/lib/emile/meson.build b/src/lib/emile/meson.build
index 4ae888c42a..e894dd20ac 100644
--- a/src/lib/emile/meson.build
+++ b/src/lib/emile/meson.build
@@ -23,8 +23,11 @@ elif (get_option('crypto') == 'openssl')
23 emile_src += 'emile_cipher_openssl.c' 23 emile_src += 'emile_cipher_openssl.c'
24endif 24endif
25 25
26emile_c_args = [ '-DEFL_BUILD' ]
27
26emile_lib = library('emile', 28emile_lib = library('emile',
27 emile_src, 29 emile_src,
30 c_args : emile_c_args,
28 include_directories: config_dir, 31 include_directories: config_dir,
29 dependencies: emile_pub_deps + emile_deps + [lz4, rg_etc, m], 32 dependencies: emile_pub_deps + emile_deps + [lz4, rg_etc, m],
30 install: true, 33 install: true,
diff --git a/src/lib/emotion/meson.build b/src/lib/emotion/meson.build
index 6f2717dfa6..0dd07f845c 100644
--- a/src/lib/emotion/meson.build
+++ b/src/lib/emotion/meson.build
@@ -44,17 +44,17 @@ if get_option('eeze') == true
44 emotion_deps += [eeze] 44 emotion_deps += [eeze]
45endif 45endif
46 46
47emotion_c_args = package_c_args + [ '-DEFL_BUILD' ]
48
47emotion_lib = library('emotion', 49emotion_lib = library('emotion',
48 emotion_src, pub_eo_file_target, priv_eo_file_target, 50 emotion_src, pub_eo_file_target, priv_eo_file_target,
49 dependencies: emotion_deps + emotion_pub_deps, 51 dependencies: emotion_deps + emotion_pub_deps,
50 include_directories : config_dir + [include_directories('.')], 52 include_directories : config_dir + [include_directories('.')],
51 install: true, 53 install: true,
52 c_args : package_c_args, 54 c_args : emotion_c_args,
53 version : meson.project_version() 55 version : meson.project_version()
54) 56)
55 57
56emotion_package_c_args = package_c_args
57
58emotion = declare_dependency( 58emotion = declare_dependency(
59 include_directories: [include_directories('.')], 59 include_directories: [include_directories('.')],
60 link_with: emotion_lib, 60 link_with: emotion_lib,
diff --git a/src/lib/eo/meson.build b/src/lib/eo/meson.build
index 83eedb0de7..8e7b3b8bc2 100644
--- a/src/lib/eo/meson.build
+++ b/src/lib/eo/meson.build
@@ -58,18 +58,23 @@ endforeach
58 58
59eolian_include_directories += ['-I', meson.current_source_dir()] 59eolian_include_directories += ['-I', meson.current_source_dir()]
60 60
61eo_c_args = [ '-DEFL_BUILD' ]
62
61eo_lib = library('eo', 63eo_lib = library('eo',
62 eo_src, pub_eo_file_target, 64 eo_src, pub_eo_file_target,
65 c_args : eo_c_args,
63 dependencies: [eina, valgrind, dl, execinfo], 66 dependencies: [eina, valgrind, dl, execinfo],
64 install: true, 67 install: true,
65 version : meson.project_version() 68 version : meson.project_version()
66) 69)
67 70
71eo_db_c_args = eo_c_args + [ '-DEO_DEBUG' ]
72
68eo_lib_dbg = library('eo_dbg', 73eo_lib_dbg = library('eo_dbg',
69 eo_src, pub_eo_file_target, 74 eo_src, pub_eo_file_target,
75 c_args : eo_c_args,
70 dependencies: [eina, valgrind, dl, execinfo], 76 dependencies: [eina, valgrind, dl, execinfo],
71 install: true, 77 install: true,
72 c_args : '-DEO_DEBUG',
73 version : meson.project_version() 78 version : meson.project_version()
74) 79)
75 80
diff --git a/src/lib/eolian/meson.build b/src/lib/eolian/meson.build
index 083d5cdaa5..cdc5af7d9e 100644
--- a/src/lib/eolian/meson.build
+++ b/src/lib/eolian/meson.build
@@ -35,11 +35,13 @@ eolian_src = [
35'eolian_aux.c' 35'eolian_aux.c'
36] 36]
37 37
38eolian_c_args = package_c_args + [ '-DEFL_BUILD' ]
39
38eolian_lib = library('eolian', eolian_src, 40eolian_lib = library('eolian', eolian_src,
39 include_directories: config_dir, 41 include_directories: config_dir,
40 dependencies: eina, 42 dependencies: eina,
41 install: true, 43 install: true,
42 c_args : package_c_args, 44 c_args : eolian_c_args,
43 version : meson.project_version() 45 version : meson.project_version()
44) 46)
45 47
diff --git a/src/lib/ephysics/meson.build b/src/lib/ephysics/meson.build
index ad1a168ae5..158afa73e3 100644
--- a/src/lib/ephysics/meson.build
+++ b/src/lib/ephysics/meson.build
@@ -20,12 +20,14 @@ ephysics_src = [
20 'ephysics_world.cpp' 20 'ephysics_world.cpp'
21] 21]
22 22
23ephysics_c_args = package_c_args + [ '-DEFL_BUILD' ]
24
23ephysics_lib = library('ephysics', 25ephysics_lib = library('ephysics',
24 ephysics_src, 26 ephysics_src,
25 dependencies: ephysics_pub_deps + [m] + ephysics_deps, 27 dependencies: ephysics_pub_deps + [m] + ephysics_deps,
26 include_directories : config_dir + [include_directories('.')], 28 include_directories : config_dir + [include_directories('.')],
27 install: true, 29 install: true,
28 c_args : package_c_args, 30 c_args : ephysics_c_args,
29 version : meson.project_version() 31 version : meson.project_version()
30) 32)
31 33
diff --git a/src/lib/ethumb/meson.build b/src/lib/ethumb/meson.build
index ffc62e91e5..0495a53f3c 100644
--- a/src/lib/ethumb/meson.build
+++ b/src/lib/ethumb/meson.build
@@ -12,12 +12,14 @@ ethumb_src = [
12ethumb_deps = [eet, evas, ecore, ecore_evas, ecore_file, ecore_imf, edje, emile] 12ethumb_deps = [eet, evas, ecore, ecore_evas, ecore_file, ecore_imf, edje, emile]
13ethumb_pub_deps = [eina, eo, efl] 13ethumb_pub_deps = [eina, eo, efl]
14 14
15ethumb_c_args = package_c_args + [ '-DEFL_BUILD' ]
16
15ethumb_lib = library('ethumb', 17ethumb_lib = library('ethumb',
16 ethumb_src, 18 ethumb_src,
17 dependencies: ethumb_pub_deps + [m] + ethumb_deps, 19 dependencies: ethumb_pub_deps + [m] + ethumb_deps,
18 include_directories : config_dir + [include_directories('.')], 20 include_directories : config_dir + [include_directories('.')],
19 install: true, 21 install: true,
20 c_args : package_c_args, 22 c_args : ethumb_c_args,
21 version : meson.project_version() 23 version : meson.project_version()
22) 24)
23 25
diff --git a/src/lib/ethumb_client/meson.build b/src/lib/ethumb_client/meson.build
index bddbab1d8d..e05f0f4ba2 100644
--- a/src/lib/ethumb_client/meson.build
+++ b/src/lib/ethumb_client/meson.build
@@ -13,12 +13,14 @@ ethumb_client_deps = [
13 13
14ethumb_client_pub_deps = [eina, eo, efl, ethumb] 14ethumb_client_pub_deps = [eina, eo, efl, ethumb]
15 15
16ethumb_client_c_args = package_c_args + [ '-DEFL_BUILD' ]
17
16ethumb_client_lib = library('ethumb_client', 18ethumb_client_lib = library('ethumb_client',
17 ethumb_client_src, 19 ethumb_client_src,
18 dependencies: ethumb_client_pub_deps + ethumb_client_deps, 20 dependencies: ethumb_client_pub_deps + ethumb_client_deps,
19 include_directories : config_dir + [include_directories('.')], 21 include_directories : config_dir + [include_directories('.')],
20 install: true, 22 install: true,
21 c_args : package_c_args, 23 c_args : ethumb_client_c_args,
22 version : meson.project_version() 24 version : meson.project_version()
23) 25)
24 26
diff --git a/src/lib/evas/meson.build b/src/lib/evas/meson.build
index a83a5e73e0..61387dce7d 100644
--- a/src/lib/evas/meson.build
+++ b/src/lib/evas/meson.build
@@ -279,13 +279,16 @@ foreach loader : evas_vg_savers_file
279 endif 279 endif
280endforeach 280endforeach
281 281
282evas_c_args = [ '-DPACKAGE_DATA_DIR="'+join_paths(dir_data, 'evas')+'"' ]
283evas_c_args += [ '-DEFL_BUILD' ]
284
282evas_lib = library('evas', 285evas_lib = library('evas',
283 include_directories: evas_include_directories + [vg_common_inc_dir], 286 include_directories: evas_include_directories + [vg_common_inc_dir],
284 sources : [evas_src, pub_eo_file_target, priv_eo_file_target], 287 sources : [evas_src, pub_eo_file_target, priv_eo_file_target],
285 dependencies: [evas_deps, m, draw, valgrind, libunibreak, evas_static_list], 288 dependencies: [evas_deps, m, draw, valgrind, libunibreak, evas_static_list],
286 link_with: evas_link, 289 link_with: evas_link,
287 install: true, 290 install: true,
288 c_args : '-DPACKAGE_DATA_DIR="'+join_paths(dir_data, 'evas')+'"', 291 c_args : evas_c_args,
289 version : meson.project_version() 292 version : meson.project_version()
290) 293)
291 294
diff --git a/src/lib/evil/meson.build b/src/lib/evil/meson.build
index 4769e58054..87a7d4c8e4 100644
--- a/src/lib/evil/meson.build
+++ b/src/lib/evil/meson.build
@@ -23,7 +23,10 @@ if target_machine.system() == 'windows'
23 secur32 = cc.find_library('secur32') 23 secur32 = cc.find_library('secur32')
24 uuid = cc.find_library('uuid') 24 uuid = cc.find_library('uuid')
25 25
26 evil_c_args = [ '-DEFL_BUILD' ]
27
26 evil_lib = library('evil', evil_src, 28 evil_lib = library('evil', evil_src,
29 c_args : evil_c_args,
27 dependencies : [psapi, ole32, ws2_32, secur32, uuid, regexp], 30 dependencies : [psapi, ole32, ws2_32, secur32, uuid, regexp],
28 include_directories : [config_dir], 31 include_directories : [config_dir],
29 install: true, 32 install: true,
diff --git a/src/modules/ecore_evas/engines/extn/meson.build b/src/modules/ecore_evas/engines/extn/meson.build
index 901a126f52..27ab19a2e7 100644
--- a/src/modules/ecore_evas/engines/extn/meson.build
+++ b/src/modules/ecore_evas/engines/extn/meson.build
@@ -1,7 +1,10 @@
1engine_src = files(['ecore_evas_extn.c', 'ecore_evas_extn_buf.c', 'ecore_evas_extn_engine.h']) 1engine_src = files(['ecore_evas_extn.c', 'ecore_evas_extn_buf.c', 'ecore_evas_extn_engine.h'])
2engine_deps = [ecore_input, ecore_ipc] 2engine_deps = [ecore_input, ecore_ipc]
3 3
4ecore_evas_mod_extn_c_args = [ '-DEFL_BUILD' ]
5
4shared_module(mod_full_name, engine_src, 6shared_module(mod_full_name, engine_src,
7 c_args : ecore_evas_mod_extn_c_args,
5 include_directories : config_dir + [engine_include_dir], 8 include_directories : config_dir + [engine_include_dir],
6 dependencies : [eina, ecore_evas, ecore_input_evas, rt] + engine_deps, 9 dependencies : [eina, ecore_evas, ecore_input_evas, rt] + engine_deps,
7 install : true, 10 install : true,
diff --git a/src/modules/ecore_evas/engines/sdl/meson.build b/src/modules/ecore_evas/engines/sdl/meson.build
index 94b990df92..6d741a7bdb 100644
--- a/src/modules/ecore_evas/engines/sdl/meson.build
+++ b/src/modules/ecore_evas/engines/sdl/meson.build
@@ -1,7 +1,10 @@
1engine_src = files(['ecore_evas_sdl.c']) 1engine_src = files(['ecore_evas_sdl.c'])
2engine_deps = [ecore_sdl, ecore_input, ecore, dependency('sdl2')] 2engine_deps = [ecore_sdl, ecore_input, ecore, dependency('sdl2')]
3 3
4ecore_evas_mod_sdl_c_args = [ '-DEFL_BUILD' ]
5
4shared_module(mod_full_name, engine_src, 6shared_module(mod_full_name, engine_src,
7 c_args : ecore_evas_mod_sdl_c_args,
5 include_directories : config_dir + [engine_include_dir], 8 include_directories : config_dir + [engine_include_dir],
6 dependencies : [eina, ecore_evas, ecore_input_evas] + engine_deps, 9 dependencies : [eina, ecore_evas, ecore_input_evas] + engine_deps,
7 install : true, 10 install : true,
diff --git a/src/modules/ecore_evas/engines/win32/meson.build b/src/modules/ecore_evas/engines/win32/meson.build
index 65fbfc1bb1..4f0889317b 100644
--- a/src/modules/ecore_evas/engines/win32/meson.build
+++ b/src/modules/ecore_evas/engines/win32/meson.build
@@ -5,7 +5,10 @@ config_h.set('BUILD_ECORE_EVAS_SOFTWARE_GDI', '1')
5 5
6engine_deps = [engine_software_ddraw, engine_software_gdi] 6engine_deps = [engine_software_ddraw, engine_software_gdi]
7 7
8ecore_evas_mod_win32_c_args = [ '-DEFL_BUILD' ]
9
8shared_module(mod_full_name, engine_src, 10shared_module(mod_full_name, engine_src,
11 c_args : ecore_evas_mod_win32_c_args,
9 include_directories : config_dir + [engine_include_dir], 12 include_directories : config_dir + [engine_include_dir],
10 dependencies : [eina, ecore_win32, ecore_input, ecore_evas, ecore_input_evas] + engine_deps, 13 dependencies : [eina, ecore_win32, ecore_input, ecore_evas, ecore_input_evas] + engine_deps,
11 install : true, 14 install : true,
diff --git a/src/modules/elementary/access_output/meson.build b/src/modules/elementary/access_output/meson.build
index f949d07671..3ae23ac0ee 100644
--- a/src/modules/elementary/access_output/meson.build
+++ b/src/modules/elementary/access_output/meson.build
@@ -2,8 +2,11 @@ src = files([
2 'mod.c', 2 'mod.c',
3]) 3])
4 4
5elm_mod_access_output_c_args = [ '-DEFL_BUILD' ]
6
5shared_module(mod, 7shared_module(mod,
6 src, 8 src,
9 c_args : elm_mod_access_output_c_args,
7 dependencies: [elementary], 10 dependencies: [elementary],
8 install: true, 11 install: true,
9 install_dir : mod_install_dir, 12 install_dir : mod_install_dir,
diff --git a/src/modules/elementary/prefs/meson.build b/src/modules/elementary/prefs/meson.build
index f36adf2965..92574e19aa 100644
--- a/src/modules/elementary/prefs/meson.build
+++ b/src/modules/elementary/prefs/meson.build
@@ -16,8 +16,11 @@ src = files([
16 'elm_horizontal_frame.c' 16 'elm_horizontal_frame.c'
17]) 17])
18 18
19elm_mod_prefs_c_args = [ '-DEFL_BUILD' ]
20
19shared_module(mod, 21shared_module(mod,
20 src, 22 src,
23 c_args : elm_mod_prefs_c_args,
21 dependencies: [elementary], 24 dependencies: [elementary],
22 install: true, 25 install: true,
23 install_dir : mod_install_dir, 26 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..e7823d11f8 100644
--- a/src/modules/elementary/test_entry/meson.build
+++ b/src/modules/elementary/test_entry/meson.build
@@ -2,8 +2,11 @@ src = files([
2 'mod.c', 2 'mod.c',
3]) 3])
4 4
5elm_mod_test_entry_c_args = [ '-DEFL_BUILD' ]
6
5shared_module(mod, 7shared_module(mod,
6 src, 8 src,
9 c_args : elm_mod_test_entry_c_args,
7 dependencies: [elementary], 10 dependencies: [elementary],
8 install: true, 11 install: true,
9 install_dir : mod_install_dir, 12 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..fbc67aa379 100644
--- a/src/modules/elementary/test_map/meson.build
+++ b/src/modules/elementary/test_map/meson.build
@@ -2,8 +2,11 @@ src = files([
2 'mod.c', 2 'mod.c',
3]) 3])
4 4
5elm_mod_test_map_c_args = [ '-DEFL_BUILD' ]
6
5shared_module(mod, 7shared_module(mod,
6 src, 8 src,
9 c_args : elm_mod_test_map_c_args,
7 dependencies: [elementary], 10 dependencies: [elementary],
8 install: true, 11 install: true,
9 install_dir : mod_install_dir, 12 install_dir : mod_install_dir,
diff --git a/src/modules/emotion/gstreamer1/meson.build b/src/modules/emotion/gstreamer1/meson.build
index 5d09a46b90..8a3989f6e5 100644
--- a/src/modules/emotion/gstreamer1/meson.build
+++ b/src/modules/emotion/gstreamer1/meson.build
@@ -15,12 +15,14 @@ generic_deps = [
15 dependency('gstreamer-pbutils-1.0'), 15 dependency('gstreamer-pbutils-1.0'),
16 ] 16 ]
17 17
18emotion_mod_gst_c_args = package_c_args + [ '-DEFL_BUILD' ]
19
18shared_module(emotion_loader, 20shared_module(emotion_loader,
19 generic_src, 21 generic_src,
20 include_directories : config_dir, 22 include_directories : config_dir,
21 dependencies: [eina, evas, emotion, generic_deps], 23 dependencies: [eina, evas, emotion, generic_deps],
22 install: true, 24 install: true,
23 install_dir : mod_install_dir, 25 install_dir : mod_install_dir,
24 c_args : package_c_args, 26 c_args : emotion_mod_gst_c_args,
25 name_suffix : sys_mod_extension 27 name_suffix : sys_mod_extension
26) 28)
diff --git a/src/modules/ethumb/emotion/meson.build b/src/modules/ethumb/emotion/meson.build
index 610b9e9e7c..bc11eeb7a4 100644
--- a/src/modules/ethumb/emotion/meson.build
+++ b/src/modules/ethumb/emotion/meson.build
@@ -22,12 +22,14 @@ endforeach
22 22
23generic_src = [files(['emotion.c']) + themes] 23generic_src = [files(['emotion.c']) + themes]
24 24
25ethumb_mod_emotion_c_args = package_c_args + [ '-DEFL_BUILD' ]
26
25shared_module(emotion_loader+'_el', 27shared_module(emotion_loader+'_el',
26 generic_src, 28 generic_src,
27 include_directories : config_dir, 29 include_directories : config_dir,
28 dependencies: [ethumb, edje, eina, eo, eet, ecore_file, ecore, evas, ecore_evas, emotion], 30 dependencies: [ethumb, edje, eina, eo, eet, ecore_file, ecore, evas, ecore_evas, emotion],
29 install: true, 31 install: true,
30 install_dir : mod_install_dir, 32 install_dir : mod_install_dir,
31 c_args : package_c_args, 33 c_args : ethumb_mod_emotion_c_args,
32 name_suffix : sys_mod_extension 34 name_suffix : sys_mod_extension
33) 35)
diff --git a/src/modules/evas/engines/buffer/meson.build b/src/modules/evas/engines/buffer/meson.build
index 8c6a071e77..369722f6f2 100644
--- a/src/modules/evas/engines/buffer/meson.build
+++ b/src/modules/evas/engines/buffer/meson.build
@@ -9,11 +9,14 @@ engine_deps = []
9 9
10evas_include_directories += include_directories('.') 10evas_include_directories += include_directories('.')
11 11
12evas_mod_buffer_c_args = [ '-DEFL_BUILD' ]
13
12install_headers('Evas_Engine_Buffer.h', 14install_headers('Evas_Engine_Buffer.h',
13 install_dir : join_paths(dir_include, 'evas-'+version_major), 15 install_dir : join_paths(dir_include, 'evas-'+version_major),
14) 16)
15 17
16evas_engine_buffer_mod = shared_module(mod_full_name, engine_src, 18evas_engine_buffer_mod = shared_module(mod_full_name, engine_src,
19 c_args : evas_mod_buffer_c_args,
17 include_directories : config_dir + [engine_include_dir], 20 include_directories : config_dir + [engine_include_dir],
18 dependencies : [eina, evas] + engine_deps, 21 dependencies : [eina, evas] + engine_deps,
19 install : true, 22 install : true,
diff --git a/src/modules/evas/engines/software_ddraw/meson.build b/src/modules/evas/engines/software_ddraw/meson.build
index 9b742757fa..8774908feb 100644
--- a/src/modules/evas/engines/software_ddraw/meson.build
+++ b/src/modules/evas/engines/software_ddraw/meson.build
@@ -7,9 +7,13 @@ engine_src = files([
7 7
8engine_deps = [cc.find_library('ddraw')] 8engine_deps = [cc.find_library('ddraw')]
9 9
10evas_mod_software_ddraw_c_args = [ '-DEFL_BUILD' ]
11evas_mod_software_ddraw_cpp_args = ['-fno-rtti', '-fno-exceptions']
12
10shared_module(mod_full_name, engine_src, 13shared_module(mod_full_name, engine_src,
14 c_args: evas_mod_software_ddraw_c_args,
15 cpp_args: evas_mod_software_ddraw_cpp_args,
11 include_directories : config_dir + [engine_include_dir], 16 include_directories : config_dir + [engine_include_dir],
12 cpp_args: ['-fno-rtti', '-fno-exceptions'],
13 dependencies : [eina, evas] + engine_deps, 17 dependencies : [eina, evas] + engine_deps,
14 install : true, 18 install : true,
15 install_dir : mod_install_dir, 19 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 ef7a0aa690..f9ee04fd1c 100644
--- a/src/modules/evas/engines/software_gdi/meson.build
+++ b/src/modules/evas/engines/software_gdi/meson.build
@@ -7,7 +7,10 @@ engine_src = files([
7 7
8engine_deps = [cc.find_library('gdi32')] 8engine_deps = [cc.find_library('gdi32')]
9 9
10evas_mod_software_gdi_c_args = [ '-DEFL_BUILD' ]
11
10shared_module(mod_full_name, engine_src, 12shared_module(mod_full_name, engine_src,
13 c_args: evas_mod_software_gdi_c_args,
11 include_directories : config_dir + [engine_include_dir], 14 include_directories : config_dir + [engine_include_dir],
12 dependencies : [eina, evas] + engine_deps, 15 dependencies : [eina, evas] + engine_deps,
13 install : true, 16 install : true,
diff --git a/src/modules/evas/image_loaders/meson.build b/src/modules/evas/image_loaders/meson.build
index 7a339b44c5..39be8e3563 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
9 evas_package_modules = join_paths(dir_lib, 'evas', 'modules') 9 evas_package_modules = join_paths(dir_lib, 'evas', 'modules')
10 mod_install_dir = join_paths(evas_package_modules, 'image_loaders', loader, version_name) 10 mod_install_dir = join_paths(evas_package_modules, 'image_loaders', loader, version_name)
11 shared_module('shared_loader_'+loader, file, 11 shared_module('shared_loader_'+loader, file,
12 c_args: [ '-DEFL_BUILD' ],
12 include_directories : config_dir, 13 include_directories : config_dir,
13 dependencies : [eina, evas] + loader_deps, 14 dependencies : [eina, evas] + loader_deps,
14 install : true, 15 install : true,
diff --git a/src/modules/evas/image_savers/meson.build b/src/modules/evas/image_savers/meson.build
index 6e1e346d06..db23ec37d4 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
9 evas_package_modules = join_paths(dir_lib, 'evas', 'modules') 9 evas_package_modules = join_paths(dir_lib, 'evas', 'modules')
10 mod_install_dir = join_paths(evas_package_modules, 'image_savers', loader, version_name) 10 mod_install_dir = join_paths(evas_package_modules, 'image_savers', loader, version_name)
11 shared_module('shared_saver_'+loader, file, 11 shared_module('shared_saver_'+loader, file,
12 c_args: [ '-DEFL_BUILD' ],
12 include_directories : config_dir, 13 include_directories : config_dir,
13 dependencies : [eina, evas] + loader_deps, 14 dependencies : [eina, evas] + loader_deps,
14 install : true, 15 install : true,