aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2007-07-29 17:20:23 +0000
committerDavid Robillard <d@drobilla.net>2007-07-29 17:20:23 +0000
commite7efd5ca2cd77a6611d7e6cb35e203158b4d0a34 (patch)
tree84b7ad4c137ad53504fdd9431ec1cc39d9aebab3
parent737c1d0a45676c21fc5025da0165ef7a6a70861e (diff)
downloadmachina-e7efd5ca2cd77a6611d7e6cb35e203158b4d0a34.tar.gz
machina-e7efd5ca2cd77a6611d7e6cb35e203158b4d0a34.tar.bz2
machina-e7efd5ca2cd77a6611d7e6cb35e203158b4d0a34.zip
Build system fixes, building from top level doesn't recursively configure slv2, but slv2 is still independently packageable/buildable.
Think I've finally figured out how to do recursive autohell without resorting to suicide... git-svn-id: http://svn.drobilla.net/lad/machina@650 a436a847-0d15-0410-975c-d299462d15a1
-rw-r--r--src/engine/JackDriver.cpp2
-rw-r--r--src/gui/main.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/engine/JackDriver.cpp b/src/engine/JackDriver.cpp
index f181508..37bf20d 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/config.h"
+#include CONFIG_H_PATH
#include "jack_compat.h"
using namespace Raul;
diff --git a/src/gui/main.cpp b/src/gui/main.cpp
index 8c6a78e..034bc62 100644
--- a/src/gui/main.cpp
+++ b/src/gui/main.cpp
@@ -20,7 +20,7 @@
#include <string>
#include <libgnomecanvasmm.h>
#include <raul/RDFWorld.hpp>
-#include "../config/config.h"
+#include CONFIG_H_PATH
#include "machina/Machine.hpp"
#include "machina/Loader.hpp"
#include "machina/SMFDriver.hpp"