aboutsummaryrefslogtreecommitdiffstats
path: root/src/engine
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2007-07-24 06:48:02 +0000
committerDavid Robillard <d@drobilla.net>2007-07-24 06:48:02 +0000
commit16751f0c2a7348ce9d060d5ba8c1e25098191a5e (patch)
tree72865c88228a32cb00caaba63eacc8783a6f90b2 /src/engine
parent60c0e1c8df1c9d598dbfc32cdab4cac1ef01a79d (diff)
downloadmachina-16751f0c2a7348ce9d060d5ba8c1e25098191a5e.tar.gz
machina-16751f0c2a7348ce9d060d5ba8c1e25098191a5e.tar.bz2
machina-16751f0c2a7348ce9d060d5ba8c1e25098191a5e.zip
Removed recursive autohell, except for SLv2.
Always build against local copies, hopefully fixing broken compilation against outdated system versions. git-svn-id: http://svn.drobilla.net/lad/machina@610 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/engine')
-rw-r--r--src/engine/JackDriver.cpp2
-rw-r--r--src/engine/Makefile.am4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/engine/JackDriver.cpp b/src/engine/JackDriver.cpp
index f45ccc6..f181508 100644
--- a/src/engine/JackDriver.cpp
+++ b/src/engine/JackDriver.cpp
@@ -19,7 +19,7 @@
#include <iomanip>
#include "machina/JackDriver.hpp"
#include "machina/MidiAction.hpp"
-#include "../config.h"
+#include "../config/config.h"
#include "jack_compat.h"
using namespace Raul;
diff --git a/src/engine/Makefile.am b/src/engine/Makefile.am
index 6e2dafb..dad7425 100644
--- a/src/engine/Makefile.am
+++ b/src/engine/Makefile.am
@@ -2,8 +2,8 @@ SUBDIRS = machina
lib_LTLIBRARIES = libmachina.la
-libmachina_la_CXXFLAGS = @RAUL_CFLAGS@ @JACK_CFLAGS@ @GLIBMM_CFLAGS@
-libmachina_la_LIBADD = @RAUL_LIBS@ @JACK_LIBS@ @GLIBMM_LIBS@
+libmachina_la_CXXFLAGS = -I$(top_srcdir)/raul @JACK_CFLAGS@ @GLIBMM_CFLAGS@
+libmachina_la_LIBADD = @RAUL_LIBS@ @JACK_LIBS@ @GLIBMM_LIBS@
libmachina_la_SOURCES = \
Node.cpp \