summaryrefslogtreecommitdiff
path: root/src/lib/elua
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/elua
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/elua')
-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
4 files changed, 15 insertions, 13 deletions
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