[gegl/wip/pippin/meson] bin:meson add lua deps
- From: Øyvind "pippin" Kolås <ok src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gegl/wip/pippin/meson] bin:meson add lua deps
- Date: Sun, 4 Aug 2019 13:07:23 +0000 (UTC)
commit 5dd5da5b3e4359beb20e984fd9e827a46fae39f6
Author: Øyvind Kolås <pippin gimp org>
Date: Sun Aug 4 14:53:11 2019 +0200
bin:meson add lua deps
bin/meson.build | 4 ++--
bin/ui-core.c | 10 +++++-----
2 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/bin/meson.build b/bin/meson.build
index 9d6ffe963..63b593e07 100644
--- a/bin/meson.build
+++ b/bin/meson.build
@@ -17,7 +17,7 @@ if libpng.found()
gegl_deps += [ libpng, ]
endif
-if mrg.found() and gexiv2.found()
+if mrg.found() and gexiv2.found() and lua.found()
gegl_sources += files(
'argvs.c',
'mrg-gegl.c',
@@ -33,7 +33,7 @@ if mrg.found() and gexiv2.found()
capture: true,
)
- gegl_deps += [ mrg, gexiv2, sdl1, ]
+ gegl_deps += [ mrg, gexiv2, sdl1, lua]
endif
if libspiro.found()
diff --git a/bin/ui-core.c b/bin/ui-core.c
index 00cba56ab..59ffaf13a 100644
--- a/bin/ui-core.c
+++ b/bin/ui-core.c
@@ -5665,7 +5665,7 @@ static void gegl_ui (Mrg *mrg, void *data)
if (g_str_has_suffix (o->path, ".lui"))
{
-#if HAVE_LUA
+#ifdef HAVE_LUA
gsize length = 0;
int result;
@@ -5714,7 +5714,7 @@ static void gegl_ui (Mrg *mrg, void *data)
if (g_str_has_suffix (o->path, ".lui"))
{
-#if HAVE_LUA
+#ifdef HAVE_LUA
int result;
int status;
if (lui_contents)
@@ -5737,7 +5737,7 @@ static void gegl_ui (Mrg *mrg, void *data)
#endif
}
-#if HAVE_LUA
+#ifdef HAVE_LUA
if (run_lua_file ("viewer.lua"))
{
}
@@ -5752,7 +5752,7 @@ static void gegl_ui (Mrg *mrg, void *data)
}
else if (S_ISDIR (stat_buf.st_mode))
{
-#if HAVE_LUA
+#ifdef HAVE_LUA
if (run_lua_file ("collection.lua"))
{
}
@@ -5769,7 +5769,7 @@ static void gegl_ui (Mrg *mrg, void *data)
if (o->show_preferences)
{
-#if HAVE_LUA
+#ifdef HAVE_LUA
if (run_lua_file ("preferences.lua"))
{
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]