summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2020-05-18 11:13:59 +0100
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2020-05-18 11:13:59 +0100
commit63b5d81983374838194b6335cc1c7b5ab9db749a (patch)
tree8a67d8d6d224d5dd48b5635709d3fdb8b2e0b4e0
parent3f0fad79b6e52debb52084b20b8b6e37cacc96a5 (diff)
Revert "Fix EAPI definition by defining EFL_BUILD for each built DLL"
This reverts commit 3ade45cbc82bea1772c7ad1afb7e1ba5dd67d930.
-rw-r--r--meson.build3
-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
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']
96 add_global_arguments('-D_GNU_SOURCE=1', language: lang) 96 add_global_arguments('-D_GNU_SOURCE=1', language: lang)
97 add_global_arguments('-DEFL_BETA_API_SUPPORT=1', language: lang) 97 add_global_arguments('-DEFL_BETA_API_SUPPORT=1', language: lang)
98 add_global_arguments('-DNEED_RUN_IN_TREE=1', language: lang) 98 add_global_arguments('-DNEED_RUN_IN_TREE=1', language: lang)
99 add_global_arguments('-DDLL_EXPORT=1', language: lang) 99 add_global_arguments('-DEFL_BUILD=1', language: lang)
100 add_global_arguments('-DELM_INTERNAL_API_ARGESFSDFEFC=1', language: lang) 100 add_global_arguments('-DELM_INTERNAL_API_ARGESFSDFEFC=1', language: lang)
101 if sys_windows == true 101 if sys_windows == true
102 add_global_arguments('-D_POSIX_C_SOURCE=200809L', language: lang) 102 add_global_arguments('-D_POSIX_C_SOURCE=200809L', language: lang)
@@ -239,6 +239,7 @@ if sys_exe_extension == ''
239else 239else
240 config_h.set_quoted('EXE_SUFFIX', '.'+sys_exe_extension) 240 config_h.set_quoted('EXE_SUFFIX', '.'+sys_exe_extension)
241endif 241endif
242config_h.set('EFL_BUILD', '1')
242 243
243if get_option('tslib') == true 244if get_option('tslib') == true
244 config_h.set('HAVE_TSLIB', '1') 245 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',
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', '-DEFL_BUILD'], 34 c_args : ['-fPIC','-DCITYHASH_BENCH', '-DEINA_ENABLE_BENCH_E17'],
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 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,
10 10
11item_container = executable('collection', 11item_container = executable('collection',
12 'collection.c', 12 'collection.c',
13 c_args: ['-DEFL_BUILD'],
14 dependencies: [elementary, ecore_input_evas, eio], 13 dependencies: [elementary, ecore_input_evas, eio],
15) 14)
16 15
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',
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 : package_c_args, 48 c_args : elm_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 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',
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 : package_c_args, 6 c_args : emotion_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 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
192 endif 192 endif
193endif 193endif
194 194
195ecore_c_args = package_c_args + [ '-DEFL_BUILD' ]
196
197ecore_lib = library('ecore', 195ecore_lib = library('ecore',
198 ecore_src, pub_eo_file_target, 196 ecore_src, pub_eo_file_target,
199 c_args : ecore_c_args,
200 dependencies: ecore_pub_deps + [m, buildsystem, ecore_deps], 197 dependencies: ecore_pub_deps + [m, buildsystem, ecore_deps],
201 include_directories : config_dir + [include_directories(join_paths('..','..'))], 198 include_directories : config_dir + [include_directories(join_paths('..','..'))],
202 install: true, 199 install: true,
200 c_args : package_c_args,
203 version : meson.project_version() 201 version : meson.project_version()
204) 202)
205 203
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
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
82ecore_audio_lib = library('ecore_audio', 80ecore_audio_lib = library('ecore_audio',
83 ecore_audio_src, pub_eo_file_target, 81 ecore_audio_src, pub_eo_file_target,
84 c_args : ecore_audio_c_args,
85 dependencies: ecore_audio_pub_deps + [m] + ecore_audio_deps, 82 dependencies: ecore_audio_pub_deps + [m] + ecore_audio_deps,
86 include_directories : config_dir, 83 include_directories : config_dir,
87 install: true, 84 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
182 182
183ecore_con_deps += crypto 183ecore_con_deps += crypto
184 184
185ecore_con_c_args = package_c_args + [ '-DEFL_BUILD' ]
186
187ecore_con_lib = library('ecore_con', 185ecore_con_lib = library('ecore_con',
188 ecore_con_src, pub_eo_file_target, 186 ecore_con_src, pub_eo_file_target,
189 dependencies: [ecore, ecore_con_deps, http_parser, eldbus, eet, buildsystem, dl], 187 dependencies: [ecore, ecore_con_deps, http_parser, eldbus, eet, buildsystem, dl],
190 include_directories : config_dir, 188 include_directories : config_dir,
191 install: true, 189 install: true,
192 c_args : ecore_con_c_args, 190 c_args : package_c_args,
193 version : meson.project_version() 191 version : meson.project_version()
194) 192)
195 193
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 = [
27 'ecore_evas_fallback_selection.c' 27 'ecore_evas_fallback_selection.c'
28] 28]
29 29
30ecore_evas_c_args = [ '-DEFL_BUILD' ]
31 30
32ecore_evas_lib = library('ecore_evas', 31ecore_evas_lib = library('ecore_evas',
33 ecore_evas_src, pub_eo_file_target, 32 ecore_evas_src, pub_eo_file_target,
34 c_args: ecore_evas_c_args,
35 dependencies: [ecore_evas_deps, buildsystem], 33 dependencies: [ecore_evas_deps, buildsystem],
36 include_directories : config_dir, 34 include_directories : config_dir,
37 install: true, 35 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
19 19
20ecore_file_header_src = ['Ecore_File.h'] 20ecore_file_header_src = ['Ecore_File.h']
21 21
22ecore_file_c_args = [ '-DEFL_BUILD' ]
23 22
24ecore_file_lib = library('ecore_file', 23ecore_file_lib = library('ecore_file',
25 ecore_file_src, 24 ecore_file_src,
26 c_args : ecore_file_c_args,
27 dependencies: ecore_file_deps + ecore_file_pub_deps + ecore_file_deps, 25 dependencies: ecore_file_deps + ecore_file_pub_deps + ecore_file_deps,
28 include_directories : config_dir + [include_directories(join_paths('..','..'))], 26 include_directories : config_dir + [include_directories(join_paths('..','..'))],
29 install: true, 27 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 = [
12 'ecore_imf_private.h', 12 'ecore_imf_private.h',
13] 13]
14 14
15ecore_imf_c_args = package_c_args + [ '-DEFL_BUILD' ]
16 15
17ecore_imf_lib = library('ecore_imf', 16ecore_imf_lib = library('ecore_imf',
18 ecore_imf_src, pub_eo_file_target, 17 ecore_imf_src, pub_eo_file_target,
19 dependencies: [buildsystem, ecore_imf_deps, ecore_imf_pub_deps], 18 dependencies: [buildsystem, ecore_imf_deps, ecore_imf_pub_deps],
20 include_directories : config_dir, 19 include_directories : config_dir,
21 c_args : ecore_imf_c_args, 20 c_args : package_c_args,
22 install: true, 21 install: true,
23 version : meson.project_version() 22 version : meson.project_version()
24) 23)
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 = [
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
14ecore_imf_evas_lib = library('ecore_imf_evas', 12ecore_imf_evas_lib = library('ecore_imf_evas',
15 ecore_imf_evas_src, 13 ecore_imf_evas_src,
16 dependencies: ecore_imf_evas_pub_deps + [m] + ecore_imf_evas_deps, 14 dependencies: ecore_imf_evas_pub_deps + [m] + ecore_imf_evas_deps,
17 include_directories : config_dir + [include_directories('.')], 15 include_directories : config_dir + [include_directories('.')],
18 install: true, 16 install: true,
19 c_args : ecore_imf_evas_c_args, 17 c_args : package_c_args,
20 version : meson.project_version() 18 version : meson.project_version()
21) 19)
22 20
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')
17 ecore_input_deps += eeze 17 ecore_input_deps += eeze
18endif 18endif
19 19
20ecore_input_c_args = [ '-DEFL_BUILD' ]
21 20
22ecore_input_lib = library('ecore_input', 21ecore_input_lib = library('ecore_input',
23 ecore_input_src, pub_eo_file_target, 22 ecore_input_src, pub_eo_file_target,
24 c_args: ecore_input_c_args,
25 dependencies: ecore_input_pub_deps + ecore_input_deps, 23 dependencies: ecore_input_pub_deps + ecore_input_deps,
26 include_directories : config_dir, 24 include_directories : config_dir,
27 install: true, 25 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 @@
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 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 = [
11 'ecore_input_evas_private.h', 11 'ecore_input_evas_private.h',
12] 12]
13 13
14ecore_input_evas_c_args = [ '-DEFL_BUILD' ]
15 14
16ecore_input_evas_lib = library('ecore_input_evas', 15ecore_input_evas_lib = library('ecore_input_evas',
17 ecore_input_evas_src, pub_eo_file_target, 16 ecore_input_evas_src, pub_eo_file_target,
18 c_args : ecore_input_evas_c_args,
19 dependencies: ecore_input_evas_pub_deps + ecore_input_evas_deps, 17 dependencies: ecore_input_evas_pub_deps + ecore_input_evas_deps,
20 include_directories : config_dir, 18 include_directories : config_dir,
21 install: true, 19 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 = [
10 'ecore_ipc_private.h', 10 'ecore_ipc_private.h',
11] 11]
12 12
13ecore_ipc_c_args = [ '-DEFL_BUILD' ]
14
15ecore_ipc_lib = library('ecore_ipc', 13ecore_ipc_lib = library('ecore_ipc',
16 ecore_ipc_src, pub_eo_file_target, 14 ecore_ipc_src, pub_eo_file_target,
17 c_args : ecore_ipc_c_args,
18 dependencies: ecore_ipc_deps + ecore_ipc_pub_deps, 15 dependencies: ecore_ipc_deps + ecore_ipc_pub_deps,
19 include_directories : config_dir, 16 include_directories : config_dir,
20 install: true, 17 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 = [
12 12
13ecore_sdl_deps += dependency('sdl2') 13ecore_sdl_deps += dependency('sdl2')
14 14
15ecore_sdl_c_args = package_c_args + [ '-DEFL_BUILD' ]
16
17ecore_sdl_lib = library('ecore_sdl', 15ecore_sdl_lib = library('ecore_sdl',
18 ecore_sdl_src, 16 ecore_sdl_src,
19 dependencies: [m] + ecore_sdl_deps + ecore_sdl_pub_deps, 17 dependencies: [m] + ecore_sdl_deps + ecore_sdl_pub_deps,
20 include_directories : config_dir + [include_directories(join_paths('..','..'))], 18 include_directories : config_dir + [include_directories(join_paths('..','..'))],
21 install: true, 19 install: true,
22 c_args : ecore_sdl_c_args, 20 c_args : package_c_args,
23) 21)
24 22
25ecore_sdl = declare_dependency( 23ecore_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
20 'Ecore_Win32.h' 20 'Ecore_Win32.h'
21 ] 21 ]
22 22
23 ecore_win32_c_args = package_c_args + [ '-DEFL_BUILD' ]
24
25 ecore_win32_lib = library('ecore_win32', 23 ecore_win32_lib = library('ecore_win32',
26 ecore_win32_src, 24 ecore_win32_src,
27 dependencies: ecore_win32_deps + ecore_win32_pub_deps, 25 dependencies: ecore_win32_deps + ecore_win32_pub_deps,
28 include_directories : config_dir, 26 include_directories : config_dir,
29 install: true, 27 install: true,
30 c_args : ecore_win32_c_args, 28 c_args : package_c_args,
31 ) 29 )
32 30
33 ecore_win32 = declare_dependency( 31 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
80 80
81subdir('software') 81subdir('software')
82 82
83ector_c_args = [ '-DEFL_BUILD' ]
84
85ector_lib = library('ector', 83ector_lib = library('ector',
86 ector_src, pub_eo_file_target, 84 ector_src, pub_eo_file_target,
87 c_args : ector_c_args,
88 dependencies: ector_pub_deps + [triangulator, freetype, draw, m] + ector_deps, 85 dependencies: ector_pub_deps + [triangulator, freetype, draw, m] + ector_deps,
89 include_directories : config_dir, 86 include_directories : config_dir,
90 install: true, 87 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 = [
144 144
145] 145]
146 146
147edje_c_args = package_c_args + [ '-DEFL_BUILD' ]
148
149edje_lib = library('edje', 147edje_lib = library('edje',
150 edje_src, pub_eo_file_target, priv_eo_file_target, 148 edje_src, pub_eo_file_target, priv_eo_file_target,
151 dependencies: edje_pub_deps + edje_deps, 149 dependencies: edje_pub_deps + edje_deps,
152 include_directories : config_dir + [include_directories('.')], 150 include_directories : config_dir + [include_directories('.')],
153 install: true, 151 install: true,
154 c_args : edje_c_args, 152 c_args : [package_c_args],
155 version : meson.project_version() 153 version : meson.project_version()
156) 154)
157 155
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 = [
18 'eet_utils.c', 18 'eet_utils.c',
19] 19]
20 20
21eet_c_args = [ '-DEFL_BUILD' ]
22
23eet_lib = library('eet', 21eet_lib = library('eet',
24 eet_src, pub_eo_file_target, 22 eet_src, pub_eo_file_target,
25 c_args : eet_c_args,
26 dependencies: eet_deps + eet_pub_deps, 23 dependencies: eet_deps + eet_pub_deps,
27 include_directories : config_dir, 24 include_directories : config_dir,
28 install: true, 25 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 = []
11subdir('interfaces') 11subdir('interfaces')
12package_header_subdirs += 'interfaces' 12package_header_subdirs += 'interfaces'
13 13
14efl_c_args = [ '-DEFL_BUILD' ]
15
16efl_lib = library('efl', 14efl_lib = library('efl',
17 efl_src, pub_eo_file_target, 15 efl_src, pub_eo_file_target,
18 c_args : efl_c_args,
19 dependencies: [eina, eo, m], 16 dependencies: [eina, eo, m],
20 install: true, 17 install: true,
21 version : meson.project_version() 18 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 = [
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
36efreet_lib = library('efreet', 34efreet_lib = library('efreet',
37 efreet_src, 35 efreet_src,
38 dependencies: efreet_pub_deps + [m] + efreet_deps, 36 dependencies: efreet_pub_deps + [m] + efreet_deps,
39 include_directories : config_dir + [include_directories('.')], 37 include_directories : config_dir + [include_directories('.')],
40 install: true, 38 install: true,
41 c_args : [efreet_c_args, '-DDATA_DIR="'+dir_data+'"'], 39 c_args : [package_c_args, '-DDATA_DIR="'+dir_data+'"'],
42 version : meson.project_version() 40 version : meson.project_version()
43) 41)
44 42
@@ -53,7 +51,7 @@ efreet_mime_lib = library('efreet_mime',
53 dependencies: efreet_pub_deps + [m, efreet, efreet_deps], 51 dependencies: efreet_pub_deps + [m, efreet, efreet_deps],
54 include_directories : config_dir + [include_directories('.')], 52 include_directories : config_dir + [include_directories('.')],
55 install: true, 53 install: true,
56 c_args : efreet_c_args, 54 c_args : package_c_args,
57 version : meson.project_version() 55 version : meson.project_version()
58) 56)
59 57
@@ -69,7 +67,7 @@ efreet_trash_lib = library('efreet_trash',
69 dependencies: efreet_pub_deps + [efreet, efreet_deps], 67 dependencies: efreet_pub_deps + [efreet, efreet_deps],
70 include_directories : config_dir + [include_directories('.')], 68 include_directories : config_dir + [include_directories('.')],
71 install: true, 69 install: true,
72 c_args : efreet_c_args, 70 c_args : package_c_args,
73 version : meson.project_version() 71 version : meson.project_version()
74) 72)
75 73
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
361 361
362execinfo = cc.find_library('execinfo', required: false) 362execinfo = cc.find_library('execinfo', required: false)
363 363
364eina_c_args = [ '-DEFL_BUILD' ]
365
366eina_lib = library('eina', sources, 364eina_lib = library('eina', sources,
367 c_args : eina_c_args,
368 include_directories : config_dir, 365 include_directories : config_dir,
369 dependencies: [m, rt, dl, execinfo, iconv, eina_deps, thread_dep, eina_mem_pools, evil], 366 dependencies: [m, rt, dl, execinfo, iconv, eina_deps, thread_dep, eina_mem_pools, evil],
370 install: true, 367 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
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
71eio_lib = library('eio', 69eio_lib = library('eio',
72 eio_src, pub_eo_file_target, 70 eio_src, pub_eo_file_target,
73 dependencies: [eina, eo, efl, m, eio_deps], 71 dependencies: [eina, eo, efl, m, eio_deps],
74 include_directories : config_dir + [include_directories('.')], 72 include_directories : config_dir + [include_directories('.')],
75 install: true, 73 install: true,
76 c_args : eio_c_args, 74 c_args : package_c_args,
77 link_args : linker_args, 75 link_args : linker_args,
78 version : meson.project_version() 76 version : meson.project_version()
79) 77)
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 = [
94 94
95eldbus_deps += dependency('dbus-1') 95eldbus_deps += dependency('dbus-1')
96 96
97eldbus_c_args = [ '-DEFL_BUILD' ]
98
99eldbus_lib = library('eldbus', 97eldbus_lib = library('eldbus',
100 eldbus_src, pub_eo_file_target, 98 eldbus_src, pub_eo_file_target,
101 c_args : eldbus_c_args,
102 dependencies: eldbus_pub_deps + eldbus_deps, 99 dependencies: eldbus_pub_deps + eldbus_deps,
103 include_directories : config_dir, 100 include_directories : config_dir,
104 install: true, 101 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 @@
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
43#ifdef _WIN32 50#ifdef _WIN32
44# define WIN32_LEAN_AND_MEAN 51# define WIN32_LEAN_AND_MEAN
45# include <winsock2.h> 52# 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'))
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')
965endif 967endif
966 968
967elm_options.set('ELM_EFREET', '1') 969elm_options.set('ELM_EFREET', '1')
@@ -1008,14 +1010,14 @@ c = configure_file(
1008 install_dir : dir_package_include, 1010 install_dir : dir_package_include,
1009 configuration: elm_options) 1011 configuration: elm_options)
1010 1012
1011elm_c_args = package_c_args + ['-DEFL_BUILD=1'] 1013elm_package_c_args = package_c_args + ['-DELEMENTARY_BUILD=1']
1012 1014
1013elementary_lib = library('elementary', 1015elementary_lib = library('elementary',
1014 elementary_src, pub_eo_file_target, priv_eo_file_target, c, embed_config, 1016 elementary_src, pub_eo_file_target, priv_eo_file_target, c, embed_config,
1015 dependencies: elementary_pub_deps + elementary_deps, 1017 dependencies: elementary_pub_deps + elementary_deps,
1016 include_directories : config_dir + [include_directories('.')] + [include_directories(join_paths('..', '..', '..'))] + [ecore_evas_wayland_engine_include_dir], 1018 include_directories : config_dir + [include_directories('.')] + [include_directories(join_paths('..', '..', '..'))] + [ecore_evas_wayland_engine_include_dir],
1017 install: true, 1019 install: true,
1018 c_args : elm_c_args, 1020 c_args : elm_package_c_args,
1019 version : meson.project_version() 1021 version : meson.project_version()
1020) 1022)
1021 1023
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 @@
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
29#ifdef EAPI 21#ifdef EAPI
30# undef EAPI 22# undef EAPI
31#endif 23#endif
@@ -100,6 +92,14 @@ extern "C" {
100 * @{ 92 * @{
101 */ 93 */
102 94
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 c731b0495a..b18d690569 100644
--- a/src/lib/elua/cache.c
+++ b/src/lib/elua/cache.c
@@ -1,10 +1,10 @@
1#include "elua_private.h"
2
1#include <sys/types.h> 3#include <sys/types.h>
2#include <sys/stat.h> 4#include <sys/stat.h>
3#include <fcntl.h> 5#include <fcntl.h>
4#include <unistd.h> 6#include <unistd.h>
5 7
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 142f61b716..77ac3df94c 100644
--- a/src/lib/elua/io.c
+++ b/src/lib/elua/io.c
@@ -1,9 +1,9 @@
1#include "elua_private.h"
2
1#ifdef _WIN32 3#ifdef _WIN32
2# include <evil_private.h> /* realpath */ 4# include <evil_private.h> /* realpath */
3#endif 5#endif
4 6
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 df1acc082a..227d211584 100644
--- a/src/lib/elua/meson.build
+++ b/src/lib/elua/meson.build
@@ -4,14 +4,12 @@ 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
9elua_lib = library('elua', 7elua_lib = library('elua',
10 elua_src, 8 elua_src,
11 c_args : elua_c_args,
12 dependencies: [m, dl] + elua_deps + elua_pub_deps, 9 dependencies: [m, dl] + elua_deps + elua_pub_deps,
13 include_directories : config_dir + [include_directories(join_paths('..','..'))], 10 include_directories : config_dir + [include_directories(join_paths('..','..'))],
14 install: true, 11 install: true,
12 c_args : package_c_args,
15 version : meson.project_version() 13 version : meson.project_version()
16) 14)
17 15
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 @@
6#include <stdlib.h> 6#include <stdlib.h>
7#include <time.h> 7#include <time.h>
8 8
9#include <Eina.h>
10
11#include "Embryo.h" 9#include "Embryo.h"
12#include "embryo_private.h" 10#include "embryo_private.h"
13 11
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 @@
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
4typedef enum _Embryo_Opcode Embryo_Opcode; 6typedef enum _Embryo_Opcode Embryo_Opcode;
5 7
6enum _Embryo_Opcode 8enum _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 @@
16#include <string.h> 16#include <string.h>
17#include <fnmatch.h> 17#include <fnmatch.h>
18 18
19#include <Eina.h>
20
21#include "Embryo.h" 19#include "Embryo.h"
22#include "embryo_private.h" 20#include "embryo_private.h"
23 21
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 = [
19 19
20embryo_deps = [eina, m] 20embryo_deps = [eina, m]
21 21
22embryo_c_args = package_c_args + [ '-DEFL_BUILD' ]
23
24embryo_lib = library('embryo', 22embryo_lib = library('embryo',
25 embryo_src, 23 embryo_src,
26 c_args : embryo_c_args,
27 dependencies: [m, buildsystem] + embryo_deps, 24 dependencies: [m, buildsystem] + embryo_deps,
28 include_directories : config_dir + [include_directories(join_paths('..','..'))], 25 include_directories : config_dir + [include_directories(join_paths('..','..'))],
29 install: true, 26 install: true,
27 c_args : package_c_args,
30 version : meson.project_version() 28 version : meson.project_version()
31) 29)
32 30
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')
23 emile_src += 'emile_cipher_openssl.c' 23 emile_src += 'emile_cipher_openssl.c'
24endif 24endif
25 25
26emile_c_args = [ '-DEFL_BUILD' ]
27
28emile_lib = library('emile', 26emile_lib = library('emile',
29 emile_src, 27 emile_src,
30 c_args : emile_c_args,
31 include_directories: config_dir, 28 include_directories: config_dir,
32 dependencies: emile_pub_deps + emile_deps + [lz4, rg_etc, m], 29 dependencies: emile_pub_deps + emile_deps + [lz4, rg_etc, m],
33 install: true, 30 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
44 emotion_deps += [eeze] 44 emotion_deps += [eeze]
45endif 45endif
46 46
47emotion_c_args = package_c_args + [ '-DEFL_BUILD' ]
48
49emotion_lib = library('emotion', 47emotion_lib = library('emotion',
50 emotion_src, pub_eo_file_target, priv_eo_file_target, 48 emotion_src, pub_eo_file_target, priv_eo_file_target,
51 dependencies: emotion_deps + emotion_pub_deps, 49 dependencies: emotion_deps + emotion_pub_deps,
52 include_directories : config_dir + [include_directories('.')], 50 include_directories : config_dir + [include_directories('.')],
53 install: true, 51 install: true,
54 c_args : emotion_c_args, 52 c_args : package_c_args,
55 version : meson.project_version() 53 version : meson.project_version()
56) 54)
57 55
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 8e7b3b8bc2..83eedb0de7 100644
--- a/src/lib/eo/meson.build
+++ b/src/lib/eo/meson.build
@@ -58,23 +58,18 @@ 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
63eo_lib = library('eo', 61eo_lib = library('eo',
64 eo_src, pub_eo_file_target, 62 eo_src, pub_eo_file_target,
65 c_args : eo_c_args,
66 dependencies: [eina, valgrind, dl, execinfo], 63 dependencies: [eina, valgrind, dl, execinfo],
67 install: true, 64 install: true,
68 version : meson.project_version() 65 version : meson.project_version()
69) 66)
70 67
71eo_db_c_args = eo_c_args + [ '-DEO_DEBUG' ]
72
73eo_lib_dbg = library('eo_dbg', 68eo_lib_dbg = library('eo_dbg',
74 eo_src, pub_eo_file_target, 69 eo_src, pub_eo_file_target,
75 c_args : eo_c_args,
76 dependencies: [eina, valgrind, dl, execinfo], 70 dependencies: [eina, valgrind, dl, execinfo],
77 install: true, 71 install: true,
72 c_args : '-DEO_DEBUG',
78 version : meson.project_version() 73 version : meson.project_version()
79) 74)
80 75
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 = [
35'eolian_aux.c' 35'eolian_aux.c'
36] 36]
37 37
38eolian_c_args = package_c_args + [ '-DEFL_BUILD' ]
39
40eolian_lib = library('eolian', eolian_src, 38eolian_lib = library('eolian', eolian_src,
41 include_directories: config_dir, 39 include_directories: config_dir,
42 dependencies: eina, 40 dependencies: eina,
43 install: true, 41 install: true,
44 c_args : eolian_c_args, 42 c_args : package_c_args,
45 version : meson.project_version() 43 version : meson.project_version()
46) 44)
47 45
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 = [
20 'ephysics_world.cpp' 20 'ephysics_world.cpp'
21] 21]
22 22
23ephysics_c_args = package_c_args + [ '-DEFL_BUILD' ]
24
25ephysics_lib = library('ephysics', 23ephysics_lib = library('ephysics',
26 ephysics_src, 24 ephysics_src,
27 dependencies: ephysics_pub_deps + [m] + ephysics_deps, 25 dependencies: ephysics_pub_deps + [m] + ephysics_deps,
28 include_directories : config_dir + [include_directories('.')], 26 include_directories : config_dir + [include_directories('.')],
29 install: true, 27 install: true,
30 c_args : ephysics_c_args, 28 c_args : package_c_args,
31 version : meson.project_version() 29 version : meson.project_version()
32) 30)
33 31
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 = [
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
17ethumb_lib = library('ethumb', 15ethumb_lib = library('ethumb',
18 ethumb_src, 16 ethumb_src,
19 dependencies: ethumb_pub_deps + [m] + ethumb_deps, 17 dependencies: ethumb_pub_deps + [m] + ethumb_deps,
20 include_directories : config_dir + [include_directories('.')], 18 include_directories : config_dir + [include_directories('.')],
21 install: true, 19 install: true,
22 c_args : ethumb_c_args, 20 c_args : package_c_args,
23 version : meson.project_version() 21 version : meson.project_version()
24) 22)
25 23
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 = [
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
18ethumb_client_lib = library('ethumb_client', 16ethumb_client_lib = library('ethumb_client',
19 ethumb_client_src, 17 ethumb_client_src,
20 dependencies: ethumb_client_pub_deps + ethumb_client_deps, 18 dependencies: ethumb_client_pub_deps + ethumb_client_deps,
21 include_directories : config_dir + [include_directories('.')], 19 include_directories : config_dir + [include_directories('.')],
22 install: true, 20 install: true,
23 c_args : ethumb_client_c_args, 21 c_args : package_c_args,
24 version : meson.project_version() 22 version : meson.project_version()
25) 23)
26 24
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
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
285evas_lib = library('evas', 282evas_lib = library('evas',
286 include_directories: evas_include_directories + [vg_common_inc_dir], 283 include_directories: evas_include_directories + [vg_common_inc_dir],
287 sources : [evas_src, pub_eo_file_target, priv_eo_file_target], 284 sources : [evas_src, pub_eo_file_target, priv_eo_file_target],
288 dependencies: [evas_deps, m, draw, valgrind, libunibreak, evas_static_list], 285 dependencies: [evas_deps, m, draw, valgrind, libunibreak, evas_static_list],
289 link_with: evas_link, 286 link_with: evas_link,
290 install: true, 287 install: true,
291 c_args : evas_c_args, 288 c_args : '-DPACKAGE_DATA_DIR="'+join_paths(dir_data, 'evas')+'"',
292 version : meson.project_version() 289 version : meson.project_version()
293) 290)
294 291
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'
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
28 evil_lib = library('evil', evil_src, 26 evil_lib = library('evil', evil_src,
29 c_args : evil_c_args,
30 dependencies : [psapi, ole32, ws2_32, secur32, uuid, regexp], 27 dependencies : [psapi, ole32, ws2_32, secur32, uuid, regexp],
31 include_directories : [config_dir], 28 include_directories : [config_dir],
32 install: true, 29 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 @@
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
6shared_module(mod_full_name, engine_src, 4shared_module(mod_full_name, engine_src,
7 c_args : ecore_evas_mod_extn_c_args,
8 include_directories : config_dir + [engine_include_dir], 5 include_directories : config_dir + [engine_include_dir],
9 dependencies : [eina, ecore_evas, ecore_input_evas, rt] + engine_deps, 6 dependencies : [eina, ecore_evas, ecore_input_evas, rt] + engine_deps,
10 install : true, 7 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 @@
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
6shared_module(mod_full_name, engine_src, 4shared_module(mod_full_name, engine_src,
7 c_args : ecore_evas_mod_sdl_c_args,
8 include_directories : config_dir + [engine_include_dir], 5 include_directories : config_dir + [engine_include_dir],
9 dependencies : [eina, ecore_evas, ecore_input_evas] + engine_deps, 6 dependencies : [eina, ecore_evas, ecore_input_evas] + engine_deps,
10 install : true, 7 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')
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
10shared_module(mod_full_name, engine_src, 8shared_module(mod_full_name, engine_src,
11 c_args : ecore_evas_mod_win32_c_args,
12 include_directories : config_dir + [engine_include_dir], 9 include_directories : config_dir + [engine_include_dir],
13 dependencies : [eina, ecore_win32, ecore_input, ecore_evas, ecore_input_evas] + engine_deps, 10 dependencies : [eina, ecore_win32, ecore_input, ecore_evas, ecore_input_evas] + engine_deps,
14 install : true, 11 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([
2 'mod.c', 2 'mod.c',
3]) 3])
4 4
5elm_mod_access_output_c_args = [ '-DEFL_BUILD' ]
6
7shared_module(mod, 5shared_module(mod,
8 src, 6 src,
9 c_args : elm_mod_access_output_c_args,
10 dependencies: [elementary], 7 dependencies: [elementary],
11 install: true, 8 install: true,
12 install_dir : mod_install_dir, 9 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([
16 'elm_horizontal_frame.c' 16 'elm_horizontal_frame.c'
17]) 17])
18 18
19elm_mod_prefs_c_args = [ '-DEFL_BUILD' ]
20
21shared_module(mod, 19shared_module(mod,
22 src, 20 src,
23 c_args : elm_mod_prefs_c_args,
24 dependencies: [elementary], 21 dependencies: [elementary],
25 install: true, 22 install: true,
26 install_dir : mod_install_dir, 23 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([
2 'mod.c', 2 'mod.c',
3]) 3])
4 4
5elm_mod_test_entry_c_args = [ '-DEFL_BUILD' ]
6
7shared_module(mod, 5shared_module(mod,
8 src, 6 src,
9 c_args : elm_mod_test_entry_c_args,
10 dependencies: [elementary], 7 dependencies: [elementary],
11 install: true, 8 install: true,
12 install_dir : mod_install_dir, 9 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([
2 'mod.c', 2 'mod.c',
3]) 3])
4 4
5elm_mod_test_map_c_args = [ '-DEFL_BUILD' ]
6
7shared_module(mod, 5shared_module(mod,
8 src, 6 src,
9 c_args : elm_mod_test_map_c_args,
10 dependencies: [elementary], 7 dependencies: [elementary],
11 install: true, 8 install: true,
12 install_dir : mod_install_dir, 9 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 = [
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
20shared_module(emotion_loader, 18shared_module(emotion_loader,
21 generic_src, 19 generic_src,
22 include_directories : config_dir, 20 include_directories : config_dir,
23 dependencies: [eina, evas, emotion, generic_deps], 21 dependencies: [eina, evas, emotion, generic_deps],
24 install: true, 22 install: true,
25 install_dir : mod_install_dir, 23 install_dir : mod_install_dir,
26 c_args : emotion_mod_gst_c_args, 24 c_args : package_c_args,
27 name_suffix : sys_mod_extension 25 name_suffix : sys_mod_extension
28) 26)
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
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
27shared_module(emotion_loader+'_el', 25shared_module(emotion_loader+'_el',
28 generic_src, 26 generic_src,
29 include_directories : config_dir, 27 include_directories : config_dir,
30 dependencies: [ethumb, edje, eina, eo, eet, ecore_file, ecore, evas, ecore_evas, emotion], 28 dependencies: [ethumb, edje, eina, eo, eet, ecore_file, ecore, evas, ecore_evas, emotion],
31 install: true, 29 install: true,
32 install_dir : mod_install_dir, 30 install_dir : mod_install_dir,
33 c_args : ethumb_mod_emotion_c_args, 31 c_args : package_c_args,
34 name_suffix : sys_mod_extension 32 name_suffix : sys_mod_extension
35) 33)
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 = []
9 9
10evas_include_directories += include_directories('.') 10evas_include_directories += include_directories('.')
11 11
12evas_mod_buffer_c_args = [ '-DEFL_BUILD' ]
13
14install_headers('Evas_Engine_Buffer.h', 12install_headers('Evas_Engine_Buffer.h',
15 install_dir : join_paths(dir_include, 'evas-'+version_major), 13 install_dir : join_paths(dir_include, 'evas-'+version_major),
16) 14)
17 15
18evas_engine_buffer_mod = shared_module(mod_full_name, engine_src, 16evas_engine_buffer_mod = shared_module(mod_full_name, engine_src,
19 c_args : evas_mod_buffer_c_args,
20 include_directories : config_dir + [engine_include_dir], 17 include_directories : config_dir + [engine_include_dir],
21 dependencies : [eina, evas] + engine_deps, 18 dependencies : [eina, evas] + engine_deps,
22 install : true, 19 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([
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
13shared_module(mod_full_name, engine_src, 10shared_module(mod_full_name, engine_src,
14 c_args: evas_mod_software_ddraw_c_args,
15 cpp_args: evas_mod_software_ddraw_cpp_args,
16 include_directories : config_dir + [engine_include_dir], 11 include_directories : config_dir + [engine_include_dir],
12 cpp_args: ['-fno-rtti', '-fno-exceptions'],
17 dependencies : [eina, evas] + engine_deps, 13 dependencies : [eina, evas] + engine_deps,
18 install : true, 14 install : true,
19 install_dir : mod_install_dir, 15 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([
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
12shared_module(mod_full_name, engine_src, 10shared_module(mod_full_name, engine_src,
13 c_args: evas_mod_software_gdi_c_args,
14 include_directories : config_dir + [engine_include_dir], 11 include_directories : config_dir + [engine_include_dir],
15 dependencies : [eina, evas] + engine_deps, 12 dependencies : [eina, evas] + engine_deps,
16 install : true, 13 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
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' ],
13 include_directories : config_dir, 12 include_directories : config_dir,
14 dependencies : [eina, evas] + loader_deps, 13 dependencies : [eina, evas] + loader_deps,
15 install : true, 14 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
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' ],
13 include_directories : config_dir, 12 include_directories : config_dir,
14 dependencies : [eina, evas] + loader_deps, 13 dependencies : [eina, evas] + loader_deps,
15 install : true, 14 install : true,