summaryrefslogtreecommitdiff
path: root/src/lib/elementary
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 /src/lib/elementary
parent3f0fad79b6e52debb52084b20b8b6e37cacc96a5 (diff)
Revert "Fix EAPI definition by defining EFL_BUILD for each built DLL"
This reverts commit 3ade45cbc82bea1772c7ad1afb7e1ba5dd67d930.
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, 11 insertions, 2 deletions
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