From a6caee81b80b02d32605ef48b1943add88a6d07e Mon Sep 17 00:00:00 2001 From: David Robillard Date: Mon, 6 Oct 2008 14:54:41 +0000 Subject: Specify absolute include paths to fix waf dependency tracking. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@1626 a436a847-0d15-0410-975c-d299462d15a1 --- src/engine/Engine.hpp | 9 +++++---- src/engine/wscript | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'src/engine') diff --git a/src/engine/Engine.hpp b/src/engine/Engine.hpp index bb194ed3..9c824c9a 100644 --- a/src/engine/Engine.hpp +++ b/src/engine/Engine.hpp @@ -55,6 +55,9 @@ class MessageContext; * This is a (GoF) facade for the engine. Pointers to all components are * available for more advanced control than this facade allows. * + * Most objects in the engine have (directly or indirectly) a pointer to the + * Engine they are a part of. + * * \ingroup engine */ class Engine : boost::noncopyable @@ -106,10 +109,8 @@ public: inline ProcessSlaves& process_slaves() { return _process_slaves; } private: - ProcessSlaves _process_slaves; - - Ingen::Shared::World* _world; - + ProcessSlaves _process_slaves; + Ingen::Shared::World* _world; SharedPtr _event_source; SharedPtr _audio_driver; MidiDriver* _midi_driver; diff --git a/src/engine/wscript b/src/engine/wscript index 0b2b3812..1f2ec1f3 100644 --- a/src/engine/wscript +++ b/src/engine/wscript @@ -79,7 +79,7 @@ def build(bld): obj.source += ' HTTPEngineReceiver.cpp ' if bld.env()['HAVE_LIBLO']: obj.source += ' OSCEngineReceiver.cpp OSCClientSender.cpp ' - obj.includes = ['..', '../common', './events'] + obj.includes = ['.', '..', '../common', './events'] obj.name = 'libingen_engine' obj.target = 'ingen_engine' obj.inst_dir = 'lib/ingen' -- cgit v1.2.1