summaryrefslogtreecommitdiff
path: root/src/lib/elementary
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/lib/elementary
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 'src/lib/elementary')
-rw-r--r--src/lib/elementary/Efl_Ui.h7
-rw-r--r--src/lib/elementary/meson.build6
2 files changed, 2 insertions, 11 deletions
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