aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meson.build2
-rw-r--r--meson_options.txt7
-rw-r--r--src/bin/edje/meson.build2
-rw-r--r--src/lib/edje/meson.build7
-rw-r--r--src/lib/elua/meson.build2
-rw-r--r--src/lib/evas/filters/meson.build32
-rw-r--r--src/lib/evas_goal/meson.build4
7 files changed, 41 insertions, 15 deletions
diff --git a/meson.build b/meson.build
index 0e2a50c2c9..eac614ba19 100644
--- a/meson.build
+++ b/meson.build
@@ -280,7 +280,7 @@ subprojects = [
['efreet' ,[] , false, false, true, false, false, false, ['eina', 'efl', 'eo'], []],
['ecore_imf_evas' ,[] , false, true, false, false, false, false, ['eina', 'efl', 'eo'], []],
['ephysics' ,['physics'] , false, true, false, false, false, false, ['eina', 'efl', 'eo'], []],
-['edje' ,[] , false, true, true, false, true, true, ['evas', 'eo', 'efl', 'luajit'], []],
+['edje' ,[] , false, true, true, false, true, true, ['evas', 'eo', 'efl', get_option('lua-interpreter')], []],
['emotion' ,[] , true, true, false, false, true, true, ['eina', 'efl', 'eo'], []],
['ethumb' ,[] , true, true, true, false, false, false, ['eina', 'efl', 'eo'], []],
['ethumb_client' ,[] , false, true, true, false, false, true, ['eina', 'efl', 'eo', 'ethumb'], []],
diff --git a/meson_options.txt b/meson_options.txt
index a8aabda212..de24f91861 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -317,6 +317,13 @@ option('bindings',
description : 'Add values here to enable the bindings',
)
+option('lua-interpreter',
+ type: 'combo',
+ choices: ['luajit', 'lua'],
+ value: 'luajit',
+ description: 'Select a type of lua interpreter to use it for edje and evas'
+)
+
option('native-arch-optimization',
type: 'boolean',
value: true,
diff --git a/src/bin/edje/meson.build b/src/bin/edje/meson.build
index 89d6382fae..9269d3338d 100644
--- a/src/bin/edje/meson.build
+++ b/src/bin/edje/meson.build
@@ -2,7 +2,7 @@ subdir('epp')
edje_bin_deps = [
eina, eo, efl, m,
- luajit, eet, evas,
+ lua, eet, evas,
ecore_file, ecore_input,
ecore_imf, ecore_imf_evas,
embryo, efreet, eio,
diff --git a/src/lib/edje/meson.build b/src/lib/edje/meson.build
index 393383fbde..549553fd67 100644
--- a/src/lib/edje/meson.build
+++ b/src/lib/edje/meson.build
@@ -1,13 +1,12 @@
edje_deps = [
eina, eo, efl, m,
- luajit, eet, evas, ecore_evas,
+ eet, evas, ecore_evas,
ecore_file, ecore_input,
ecore_imf, ecore_imf_evas,
embryo, efreet, eio, intl
]
-
-edje_pub_deps = [m, evas, eo, efl, luajit]
+edje_pub_deps = [m, evas, eo, efl, lua]
if (get_option('physics'))
edje_deps += ephysics
@@ -151,7 +150,7 @@ edje_src = [
edje_lib = library('edje',
edje_src, pub_eo_file_target, priv_eo_file_target,
- dependencies: [edje_deps],
+ dependencies: edje_pub_deps + edje_deps,
include_directories : config_dir + [include_directories('.')],
install: true,
c_args : [package_c_args],
diff --git a/src/lib/elua/meson.build b/src/lib/elua/meson.build
index 7e0c3af7ba..9f1d270bba 100644
--- a/src/lib/elua/meson.build
+++ b/src/lib/elua/meson.build
@@ -1,5 +1,5 @@
elua_deps = [eina, eo, efl, ecore, ecore_file, intl]
-elua_pub_deps = [luajit]
+elua_pub_deps = [dependency('luajit')]
elua_src = ['elua.c', 'io.c', 'cache.c']
elua_header_src = ['Elua.h']
diff --git a/src/lib/evas/filters/meson.build b/src/lib/evas/filters/meson.build
index 019b1d123c..a98d039e72 100644
--- a/src/lib/evas/filters/meson.build
+++ b/src/lib/evas/filters/meson.build
@@ -7,13 +7,33 @@ evas_src += files([
'evas_filter_utils.c',
])
-luajit = dependency('luajit')
+luaold_interpreters = [
+ ['lua', '>=5.1.0'],
+ ['lua51', '>=5.1.0'],
+ ['lua-5.1', '>=5.1.0'],
+ ['lua5.1', '>=5.1.0'],
+ ['lua52', '>=5.2.0'],
+ ['lua-5.2', '>=5.2.0'],
+ ['lua5.2', '>=5.2.0'],
+]
+
+if get_option('lua-interpreter') == 'lua'
+ foreach l : luaold_interpreters
+ lua = dependency(l[0], version: l[1], required:false)
+ if lua.found() == true
+ break
+ endif
+ endforeach
+else
+ lua = dependency(get_option('lua-interpreter'), required:false)
+endif
+
if sys_osx == true
-# luajit on macos is broken, this means we need to generate our own dependency with our arguments, a library later still needs to link to luajit for the pagesize argument thingy
- luajit = declare_dependency(
- include_directories: include_directories(luajit.get_pkgconfig_variable('includedir')),
- link_args: ['-L'+luajit.get_pkgconfig_variable('libdir'), '-l'+luajit.get_pkgconfig_variable('libname')]
+# lua on macro is broken, this means we need to generate our own dependency with our arguments, a library later still needs to link to lua for the pagesize argument thingy
+ lua = declare_dependency(
+ include_directories: include_directories(lua.get_pkgconfig_variable('includedir')),
+ link_args: ['-L'+lua.get_pkgconfig_variable('libdir'), '-l'+lua.get_pkgconfig_variable('libname')]
)
endif
-evas_deps += luajit
+evas_deps += lua
diff --git a/src/lib/evas_goal/meson.build b/src/lib/evas_goal/meson.build
index 60426ad526..5746006908 100644
--- a/src/lib/evas_goal/meson.build
+++ b/src/lib/evas_goal/meson.build
@@ -17,7 +17,7 @@ evas = declare_dependency(
evas_bin = declare_dependency(
link_with : [evas_lib],
- dependencies : [eina, ecore, ector, emile, dependency('luajit')],
+ dependencies : [eina, ecore, ector, emile, lua],
include_directories : evas_include_directories
)
@@ -32,5 +32,5 @@ pkgconfig.generate(evas_lib,
name : 'evas',
subdirs : ['evas-'+version_major] + tmp_package_subdirs,
version : version_major + '.' + version_minor + '.' + version_micro,
- libraries : [eina, ecore, ector, emile, dependency('luajit')],
+ libraries : [eina, ecore, ector, emile, lua],
)