From 68950f4242129b61991b575b22d8ee503ae4b7fd Mon Sep 17 00:00:00 2001 From: David Robillard Date: Mon, 20 Jun 2011 02:19:24 +0000 Subject: Build Jalv in top-level build. git-svn-id: http://svn.drobilla.net/lad/trunk/jalv@3409 a436a847-0d15-0410-975c-d299462d15a1 --- src/jalv.c | 6 +++--- wscript | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/jalv.c b/src/jalv.c index b1724b9..2f9d541 100644 --- a/src/jalv.c +++ b/src/jalv.c @@ -23,6 +23,9 @@ #include #include +#include "jalv_internal.h" +#include "jalv-config.h" + #include #include #ifdef JALV_JACK_SESSION @@ -37,9 +40,6 @@ #include "suil/suil.h" -#include "jalv_internal.h" -#include "jalv-config.h" - sem_t exit_sem; /**< Exit semaphore */ #define MIDI_BUFFER_SIZE 1024 diff --git a/wscript b/wscript index 9240ed7..343ccbc 100644 --- a/wscript +++ b/wscript @@ -64,13 +64,12 @@ def configure(conf): def build(bld): libs = 'LILV SUIL JACK' - if bld.is_defined('JALV_JACK_SESSION'): - libs += ' GLIB GTHREAD' # Non-GUI version obj = bld(features = 'c cprogram', source = 'src/jalv.c src/symap.c src/jalv_console.c', target = 'jalv', + includes = ['.'], install_path = '${BINDIR}') autowaf.use_lib(bld, obj, libs) @@ -79,6 +78,7 @@ def build(bld): obj = bld(features = 'c cprogram', source = 'src/jalv.c src/symap.c src/jalv_gtk2.c', target = 'jalv.gtk', + includes = ['.'], install_path = '${BINDIR}') autowaf.use_lib(bld, obj, libs + ' GTK2') @@ -87,6 +87,7 @@ def build(bld): obj = bld(features = 'c cxx cxxprogram', source = 'src/jalv.c src/symap.c src/jalv_qt4.cpp', target = 'jalv.qt', + includes = ['.'], install_path = '${BINDIR}') autowaf.use_lib(bld, obj, libs + ' QT4') -- cgit v1.2.1