aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRobin Haberkorn <robin.haberkorn@googlemail.com>2012-05-11 04:20:49 +0200
committerRobin Haberkorn <robin.haberkorn@googlemail.com>2012-05-11 04:42:36 +0200
commitd0860cb211302c0c214b3b67296f22f78ea06085 (patch)
treeb2e9654db325942660ee6cb1c7cafcbf52e54458 /src
parentc8826d1e01297aa71f966d9d290a4ebaf7eaaecf (diff)
downloadgtk-vlc-player-d0860cb211302c0c214b3b67296f22f78ea06085.tar.gz
stubs for experiment navigator widget (to be implemented by Jens L.)
* will be part of a larger library of experiment-player-related widgets (libgtk-experiment-widgets) * an experiment-transcript widget will be part of that library later on * Glade catalog for entire library; installed into experiment-player datadir * preliminary stub for libexperiment-reader, a gobject-based library that abstracts from reading the "Folker"-based transcript files
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am10
-rw-r--r--src/main.c3
2 files changed, 11 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index f81a233..4ed7ab2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -14,11 +14,17 @@ if USE_W32_RES
experiment_player_LDADD += icon.$(OBJEXT)
endif
+experiment_player_CFLAGS += @LIBGTK_CFLAGS@
+experiment_player_LDADD += @LIBGTK_LIBS@
+
experiment_player_CPPFLAGS += -I@top_srcdir@/lib/gtk-vlc-player
experiment_player_LDADD += @top_srcdir@/lib/gtk-vlc-player/libgtk-vlc-player.la
-experiment_player_CFLAGS += @LIBGTK_CFLAGS@
-experiment_player_LDADD += @LIBGTK_LIBS@
+experiment_player_CPPFLAGS += -I@top_srcdir@/lib/gtk-experiment-widgets
+experiment_player_LDADD += @top_srcdir@/lib/gtk-experiment-widgets/libgtk-experiment-widgets.la
+
+experiment_player_CPPFLAGS += -I@top_srcdir@/lib/experiment-reader
+#experiment_player_LDADD += @top_srcdir@/lib/experiment-reader/libexperiment-reader.la
experiment_player_CFLAGS += @GTKAPP_CFLAGS@
experiment_player_LDFLAGS += @GTKAPP_LDFLAGS@
diff --git a/src/main.c b/src/main.c
index ab5dbaa..30c8556 100644
--- a/src/main.c
+++ b/src/main.c
@@ -16,7 +16,10 @@
#include <glib.h>
#include <gtk/gtk.h>
+
#include <gtk-vlc-player.h>
+#include <gtk-experiment-navigator.h>
+#include <experiment-reader.h>
#include "experiment-player.h"