[gegl] fix compilation of gcut without ui
- From: Øyvind Kolås <ok src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gegl] fix compilation of gcut without ui
- Date: Fri, 14 Jul 2017 19:23:48 +0000 (UTC)
commit 1a429d70f841e684aa7bd56ae5891a15e14a75f3
Author: Øyvind Kolås <pippin gimp org>
Date: Fri Jul 14 21:20:09 2017 +0200
fix compilation of gcut without ui
gcut/Makefile.am | 3 +--
gcut/gcut.c | 11 ++++++++++-
2 files changed, 11 insertions(+), 3 deletions(-)
---
diff --git a/gcut/Makefile.am b/gcut/Makefile.am
index 72721bf..0ca1c89 100644
--- a/gcut/Makefile.am
+++ b/gcut/Makefile.am
@@ -46,7 +46,6 @@ default.edl.inc: default.edl
gcut_SOURCES = \
gcut.c \
gcut.h \
- renderer.c \
iconographer.c \
clip.c
@@ -54,7 +53,7 @@ gcut_SOURCES = \
if HAVE_MRG
if HAVE_GEXIV2
if HAVE_SDL
-gcut_SOURCES += gcut-ui.c
+gcut_SOURCES += gcut-ui.c renderer.c
AM_CFLAGS += $(SDL_CFLAGS)
AM_LDFLAGS += $(SDL_LIBS)
endif
diff --git a/gcut/gcut.c b/gcut/gcut.c
index 0216e3b..fedcd61 100644
--- a/gcut/gcut.c
+++ b/gcut/gcut.c
@@ -5,6 +5,7 @@
#include <stdio.h>
#include <gegl.h>
#include <gexiv2/gexiv2.h>
+#include <libgen.h>
#include <gegl-audio-fragment.h>
/* GEGL edit decision list - a digital video cutter and splicer */
@@ -961,7 +962,7 @@ GeglEDL *gcut_new_from_path (const char *path)
}
else
{
- edl->path = g_strdup_printf ("%s/%s", parent, basename (path));
+ edl->path = g_strdup_printf ("%s/%s", parent, basename ((void*)path));
}
}
g_free (parent);
@@ -1183,7 +1184,15 @@ int gegl_make_thumb_video (GeglEDL *edl, const char *path, const char *thumb_pat
#endif
}
+#if HAVE_MRG
int gcut_ui_main (GeglEDL *edl);
+#else
+int gcut_ui_main (GeglEDL *edl);
+int gcut_ui_main (GeglEDL *edl)
+{
+ return -1;
+}
+#endif
int gegl_make_thumb_video (GeglEDL *edl, const char *path, const char *thumb_path);
void gcut_make_proxies (GeglEDL *edl)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]