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