summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schmidt <s.schmidt@samsung.com>2020-05-18 16:53:22 +0200
committerStefan Schmidt <s.schmidt@samsung.com>2020-05-25 15:58:29 +0200
commitd7670970059b1fa379af1b5c64e1cf7d8a84ac70 (patch)
treebfa90877b735c4465f29c5e989cdfed455a4f6dd
parent3b39cb947206b6f249c34b4eb131dbcc1b2cac67 (diff)
build: set DLL_EXPORT when on a windows system
No need to have this elementary specific, we can do this globally. Original patch by Vincent Torri. Differential Revision: https://phab.enlightenment.org/D11850 Signed-off-by: Stefan Schmidt <s.schmidt@samsung.com>
-rw-r--r--meson.build1
-rw-r--r--src/lib/elementary/meson.build2
2 files changed, 1 insertions, 2 deletions
diff --git a/meson.build b/meson.build
index b55855920c..35449d3442 100644
--- a/meson.build
+++ b/meson.build
@@ -100,6 +100,7 @@ foreach lang : ['c', 'objc', 'cpp']
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)
103 add_global_arguments('-DDLL_EXPORT=1', language: lang)
103 if (get_option('windows-version') == 'vista') 104 if (get_option('windows-version') == 'vista')
104 add_global_arguments('-DWINVER=0x060', language: lang) 105 add_global_arguments('-DWINVER=0x060', language: lang)
105 add_global_arguments('-D_WIN32_WINNT=0x0600', language: lang) 106 add_global_arguments('-D_WIN32_WINNT=0x0600', language: lang)
diff --git a/src/lib/elementary/meson.build b/src/lib/elementary/meson.build
index 29e7dfc3df..eb5c9e674f 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')