Global build system, build system bugfixes.
git-svn-id: http://svn.drobilla.net/lad@154 a436a847-0d15-0410-975c-d299462d15a1
This commit is contained in:
parent
f0cd56f0be
commit
555deca292
19
BUILDING
19
BUILDING
|
@ -1,19 +0,0 @@
|
|||
At some point a spiffy build script of some variety should live here.
|
||||
Until then, the build orders:
|
||||
|
||||
|
||||
* Ingen:
|
||||
|
||||
flowcanvas
|
||||
libslv2
|
||||
ingen
|
||||
|
||||
|
||||
* Patchage:
|
||||
|
||||
flowcanvas
|
||||
patchage
|
||||
|
||||
|
||||
(Everything else has no interdependencies)
|
||||
|
|
@ -0,0 +1 @@
|
|||
SUBDIRS = flowcanvas patchage libslv2 omins ingen
|
|
@ -0,0 +1,15 @@
|
|||
This is not a "project", but an entire repository of code containing many
|
||||
projects (checked out from http://codeson.net). The only common thread
|
||||
tying it all together is that I wrote it. Hi. :)
|
||||
|
||||
There are build scripts in this directory for convenience, but every
|
||||
subdirectory can be used individually as an independent (autotoolized)
|
||||
project.
|
||||
|
||||
'./configure --help=recursive' will give you a (horribly large and bloated)
|
||||
listing of all configure options which you can pass to the top level
|
||||
configure script to build everything however you like.
|
||||
|
||||
Enjoy,
|
||||
|
||||
-Dave
|
|
@ -0,0 +1,17 @@
|
|||
AC_PREREQ(2.59)
|
||||
AC_INIT([ingen],[svn],[drobilla@connect.carleton.ca])
|
||||
AM_INIT_AUTOMAKE
|
||||
|
||||
AC_CONFIG_SUBDIRS([flowcanvas])
|
||||
AC_CONFIG_SUBDIRS([patchage])
|
||||
AC_CONFIG_SUBDIRS([libslv2])
|
||||
AC_CONFIG_SUBDIRS([omins])
|
||||
AC_CONFIG_SUBDIRS([ingen])
|
||||
|
||||
AC_CONFIG_FILES([Makefile])
|
||||
|
||||
AC_OUTPUT
|
||||
|
||||
AC_MSG_NOTICE([])
|
||||
AC_MSG_NOTICE([Now type 'make' to marvel at screenfuls of unintelligible junk])
|
||||
AC_MSG_NOTICE([for what seems like days.])
|
|
@ -74,7 +74,7 @@ public:
|
|||
bool add_connection(boost::shared_ptr<Port> port1,
|
||||
boost::shared_ptr<Port> port2);
|
||||
|
||||
void add_connection(boost::shared_ptr<Connection> connection);
|
||||
bool add_connection(boost::shared_ptr<Connection> connection);
|
||||
|
||||
boost::shared_ptr<Connection> remove_connection(boost::shared_ptr<Port> port1,
|
||||
boost::shared_ptr<Port> port2);
|
||||
|
|
|
@ -479,10 +479,20 @@ FlowCanvas::add_connection(boost::shared_ptr<Port> port1, boost::shared_ptr<Port
|
|||
}
|
||||
|
||||
|
||||
void
|
||||
bool
|
||||
FlowCanvas::add_connection(boost::shared_ptr<Connection> c)
|
||||
{
|
||||
m_connections.push_back(c);
|
||||
boost::shared_ptr<Port> src = c->source().lock();
|
||||
boost::shared_ptr<Port> dst = c->dest().lock();
|
||||
|
||||
if (src && dst) {
|
||||
src->add_connection(c);
|
||||
dst->add_connection(c);
|
||||
m_connections.push_back(c);
|
||||
return true;
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -127,11 +127,15 @@ Port::move_connections()
|
|||
* A reference to the connection is not retained (only a weak_ptr is stored).
|
||||
*/
|
||||
void
|
||||
Port::add_connection(boost::shared_ptr<Connection> c)
|
||||
Port::add_connection(boost::shared_ptr<Connection> connection)
|
||||
{
|
||||
//list<boost::weak_ptr<Connection> >::iterator i = find(m_connections.begin(), m_connections.end(), boost::weak_ptr<Connection>(c));
|
||||
//if (i == m_connections.end())
|
||||
m_connections.push_back(c);
|
||||
for (list<boost::weak_ptr<Connection> >::iterator i = m_connections.begin(); i != m_connections.end(); i++) {
|
||||
boost::shared_ptr<Connection> c = (*i).lock();
|
||||
if (c && c == connection)
|
||||
return;
|
||||
}
|
||||
|
||||
m_connections.push_back(connection);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
SUBDIRS = src
|
||||
SUBDIRS = src patches
|
||||
|
||||
doc: doc/Doxyfile src/engine/*.h src/engine/*.cpp \
|
||||
src/common/util/*.h \
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
C_PREREQ(2.59)
|
||||
AC_PREREQ(2.59)
|
||||
AC_INIT([ingen],[0.4.0pre],[drobilla@connect.carleton.ca])
|
||||
AC_CONFIG_SRCDIR([src/common/util/CountedPtr.h])
|
||||
AC_CONFIG_SRCDIR([src/common/interface/EngineInterface.h])
|
||||
|
@ -394,6 +394,7 @@ AC_CONFIG_FILES([src/common/interface/Makefile])
|
|||
AC_CONFIG_FILES([src/libs/Makefile])
|
||||
AC_CONFIG_FILES([src/libs/engine/Makefile])
|
||||
AC_CONFIG_FILES([src/libs/engine/tests/Makefile])
|
||||
AC_CONFIG_FILES([src/libs/engine/events/Makefile])
|
||||
AC_CONFIG_FILES([src/libs/client/Makefile])
|
||||
AC_CONFIG_FILES([src/progs/Makefile])
|
||||
AC_CONFIG_FILES([src/progs/server/Makefile])
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
SUBDIRS = libs progs
|
||||
DIST_SUBDIRS = common
|
||||
|
||||
DIST_SUBDIRS = $(SUBDIRS) common
|
||||
|
||||
|
|
|
@ -7,7 +7,6 @@ libingenclient_la_CXXFLAGS = -I$(top_srcdir)/src/common -DPKGDATADIR=\"$(pkgdata
|
|||
libingenclient_la_LIBADD = @LXML2_LIBS@ @LOSC_LIBS@ @RAPTOR_LIBS@ @LSIGCPP_LIBS@
|
||||
|
||||
libingenclient_la_SOURCES = \
|
||||
ClientInterface.h \
|
||||
OSCEngineSender.h \
|
||||
OSCEngineSender.cpp \
|
||||
OSCModelEngineInterface.h \
|
||||
|
@ -21,7 +20,6 @@ libingenclient_la_SOURCES = \
|
|||
ModelEngineInterface.cpp \
|
||||
PresetModel.h \
|
||||
ControlModel.h \
|
||||
ObjectController.h \
|
||||
ObjectModel.h \
|
||||
ObjectModel.cpp \
|
||||
NodeModel.h \
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
SUBDIRS = tests
|
||||
DIST_SUBDIRS = events
|
||||
SUBDIRS = tests events
|
||||
|
||||
AM_CXXFLAGS = @JACK_CFLAGS@ @LOSC_CFLAGS@ @ALSA_CFLAGS@ @LASH_CFLAGS@ @SLV2_CFLAGS@ -I$(top_srcdir)/src/common -I$(top_srcdir)/src/libs/engine/events
|
||||
|
||||
|
@ -12,6 +11,7 @@ noinst_LTLIBRARIES = libingen.la
|
|||
libingen_la_SOURCES = \
|
||||
util.h \
|
||||
tuning.h \
|
||||
events.h \
|
||||
DataType.h \
|
||||
Node.h \
|
||||
NodeBase.h \
|
||||
|
@ -31,7 +31,6 @@ libingen_la_SOURCES = \
|
|||
DirectResponder.h \
|
||||
OSCResponder.h \
|
||||
OSCResponder.cpp \
|
||||
ClientKey.h \
|
||||
ClientBroadcaster.h \
|
||||
ClientBroadcaster.cpp \
|
||||
ObjectSender.h \
|
||||
|
@ -68,7 +67,7 @@ libingen_la_SOURCES = \
|
|||
Maid.cpp \
|
||||
MaidObject.h \
|
||||
Tree.h \
|
||||
ClientRecord.h \
|
||||
TreeImplementation.h \
|
||||
PluginLibrary.h \
|
||||
Plugin.h \
|
||||
Plugin.cpp \
|
||||
|
@ -88,12 +87,6 @@ libingen_la_SOURCES = \
|
|||
AudioDriver.h \
|
||||
MidiDriver.h \
|
||||
midi.h \
|
||||
../libingen_la/util/Semaphore.h \
|
||||
../libingen_la/util/types.h \
|
||||
../libingen_la/util/Path.h \
|
||||
../libingen_la/util/Queue.h \
|
||||
../libingen_la/interface/ClientInterface.h \
|
||||
../libingen_la/interface/EngineInterface.h \
|
||||
instantiations.cpp \
|
||||
events/RegisterClientEvent.h \
|
||||
events/RegisterClientEvent.cpp \
|
||||
|
@ -213,7 +206,6 @@ endif
|
|||
if WITH_LASH
|
||||
libingen_la_SOURCES += \
|
||||
LashDriver.h \
|
||||
LashDriver.cpp \
|
||||
LashRestoreDoneEvent.h
|
||||
LashDriver.cpp
|
||||
endif
|
||||
|
||||
|
|
|
@ -1,65 +1,65 @@
|
|||
MAINTAINERCLEANFILES = Makefile.in
|
||||
|
||||
EXTRA_DIST = \
|
||||
events/RegisterClientEvent.h \
|
||||
events/RegisterClientEvent.cpp \
|
||||
events/UnregisterClientEvent.h \
|
||||
events/UnregisterClientEvent.cpp \
|
||||
events/PingQueuedEvent.h \
|
||||
events/ActivateEvent.h \
|
||||
events/ActivateEvent.cpp \
|
||||
events/DeactivateEvent.h \
|
||||
events/DeactivateEvent.cpp \
|
||||
events/SetPortValueEvent.h \
|
||||
events/SetPortValueEvent.cpp \
|
||||
events/SetPortValueQueuedEvent.h \
|
||||
events/SetPortValueQueuedEvent.cpp \
|
||||
events/NoteOnEvent.h \
|
||||
events/NoteOnEvent.cpp \
|
||||
events/NoteOffEvent.h \
|
||||
events/NoteOffEvent.cpp \
|
||||
events/AllNotesOffEvent.h \
|
||||
events/AllNotesOffEvent.cpp \
|
||||
events/ConnectionEvent.h \
|
||||
events/ConnectionEvent.cpp \
|
||||
events/DisconnectionEvent.h \
|
||||
events/DisconnectionEvent.cpp \
|
||||
events/DisconnectNodeEvent.h \
|
||||
events/DisconnectNodeEvent.cpp \
|
||||
events/DisconnectPortEvent.h \
|
||||
events/DisconnectPortEvent.cpp \
|
||||
events/DestroyEvent.h \
|
||||
events/DestroyEvent.cpp \
|
||||
events/AddNodeEvent.h \
|
||||
events/AddNodeEvent.cpp \
|
||||
events/SetMetadataEvent.h \
|
||||
events/SetMetadataEvent.cpp \
|
||||
events/RequestMetadataEvent.h \
|
||||
events/RequestMetadataEvent.cpp \
|
||||
events/RequestPluginEvent.h \
|
||||
events/RequestPluginEvent.cpp \
|
||||
events/RequestObjectEvent.h \
|
||||
events/RequestObjectEvent.cpp \
|
||||
events/RequestPortValueEvent.h \
|
||||
events/RequestPortValueEvent.cpp \
|
||||
events/RequestAllObjectsEvent.h \
|
||||
events/RequestAllObjectsEvent.cpp \
|
||||
events/RequestPluginsEvent.h \
|
||||
events/RequestPluginsEvent.cpp \
|
||||
events/CreatePatchEvent.h \
|
||||
events/CreatePatchEvent.cpp \
|
||||
events/LoadPluginsEvent.h \
|
||||
events/LoadPluginsEvent.cpp \
|
||||
events/EnablePatchEvent.h \
|
||||
events/EnablePatchEvent.cpp \
|
||||
events/DisablePatchEvent.h \
|
||||
events/DisablePatchEvent.cpp \
|
||||
events/ClearPatchEvent.h \
|
||||
events/ClearPatchEvent.cpp \
|
||||
events/RenameEvent.h \
|
||||
events/RenameEvent.cpp \
|
||||
events/MidiLearnEvent.h \
|
||||
events/MidiLearnEvent.cpp \
|
||||
RegisterClientEvent.h \
|
||||
RegisterClientEvent.cpp \
|
||||
UnregisterClientEvent.h \
|
||||
UnregisterClientEvent.cpp \
|
||||
PingQueuedEvent.h \
|
||||
ActivateEvent.h \
|
||||
ActivateEvent.cpp \
|
||||
DeactivateEvent.h \
|
||||
DeactivateEvent.cpp \
|
||||
SetPortValueEvent.h \
|
||||
SetPortValueEvent.cpp \
|
||||
SetPortValueQueuedEvent.h \
|
||||
SetPortValueQueuedEvent.cpp \
|
||||
NoteOnEvent.h \
|
||||
NoteOnEvent.cpp \
|
||||
NoteOffEvent.h \
|
||||
NoteOffEvent.cpp \
|
||||
AllNotesOffEvent.h \
|
||||
AllNotesOffEvent.cpp \
|
||||
ConnectionEvent.h \
|
||||
ConnectionEvent.cpp \
|
||||
DisconnectionEvent.h \
|
||||
DisconnectionEvent.cpp \
|
||||
DisconnectNodeEvent.h \
|
||||
DisconnectNodeEvent.cpp \
|
||||
DisconnectPortEvent.h \
|
||||
DisconnectPortEvent.cpp \
|
||||
DestroyEvent.h \
|
||||
DestroyEvent.cpp \
|
||||
AddNodeEvent.h \
|
||||
AddNodeEvent.cpp \
|
||||
SetMetadataEvent.h \
|
||||
SetMetadataEvent.cpp \
|
||||
RequestMetadataEvent.h \
|
||||
RequestMetadataEvent.cpp \
|
||||
RequestPluginEvent.h \
|
||||
RequestPluginEvent.cpp \
|
||||
RequestObjectEvent.h \
|
||||
RequestObjectEvent.cpp \
|
||||
RequestPortValueEvent.h \
|
||||
RequestPortValueEvent.cpp \
|
||||
RequestAllObjectsEvent.h \
|
||||
RequestAllObjectsEvent.cpp \
|
||||
RequestPluginsEvent.h \
|
||||
RequestPluginsEvent.cpp \
|
||||
CreatePatchEvent.h \
|
||||
CreatePatchEvent.cpp \
|
||||
LoadPluginsEvent.h \
|
||||
LoadPluginsEvent.cpp \
|
||||
EnablePatchEvent.h \
|
||||
EnablePatchEvent.cpp \
|
||||
DisablePatchEvent.h \
|
||||
DisablePatchEvent.cpp \
|
||||
ClearPatchEvent.h \
|
||||
ClearPatchEvent.cpp \
|
||||
RenameEvent.h \
|
||||
RenameEvent.cpp \
|
||||
MidiLearnEvent.h \
|
||||
MidiLearnEvent.cpp \
|
||||
DSSIConfigureEvent.cpp \
|
||||
DSSIConfigureEvent.h \
|
||||
DSSIControlEvent.cpp \
|
||||
|
|
|
@ -5,23 +5,16 @@ common_ldadd = @JACK_LIBS@ @LOSC_LIBS@ @ALSA_LIBS@ -lrt
|
|||
node_tree_test_LDADD = $(common_ldadd)
|
||||
queue_test_LDADD = $(common_ldadd)
|
||||
|
||||
bin_PROGRAMS = node_tree_test queue_test list_test path_test
|
||||
bin_PROGRAMS = node_tree_test queue_test list_test
|
||||
|
||||
list_test_SOURCES = \
|
||||
../List.h \
|
||||
list_test.cpp
|
||||
|
||||
path_test_SOURCES = \
|
||||
../../common/Path.h \
|
||||
path_test.cpp
|
||||
|
||||
node_tree_test_SOURCES = \
|
||||
node_tree_test.cpp \
|
||||
../Tree.h \
|
||||
../TreeImplementation.h
|
||||
node_tree_test.cpp
|
||||
|
||||
queue_test_SOURCES = \
|
||||
queue_test.cpp \
|
||||
../../common/Queue.h
|
||||
queue_test.cpp
|
||||
|
||||
endif # BUILD_UNIT_TESTS
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
AM_CXXFLAGS = -I$(top_srcdir)/src/common
|
||||
|
||||
DIST_SUBDIRS = python supercollider
|
||||
DIST_SUBDIRS = python supercollider patch_loader ingenuity server demolition
|
||||
|
||||
SUBDIRS = server
|
||||
|
||||
|
|
|
@ -75,6 +75,8 @@ DSSIController::show_gui()
|
|||
void
|
||||
DSSIController::update_program_menu()
|
||||
{
|
||||
cerr << "FIXME: Program menu\n";
|
||||
#if 0
|
||||
m_program_menu.items().clear();
|
||||
|
||||
const map<int, map<int, string> >& banks = node_model()->get_programs();
|
||||
|
@ -113,13 +115,14 @@ DSSIController::update_program_menu()
|
|||
m_program_menu_item->set_sensitive(true);
|
||||
|
||||
m_banks_dirty = false;
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
DSSIController::send_program_change(int bank, int program)
|
||||
{
|
||||
App::instance().engine()->set_program(node_model()->path(), bank, program);
|
||||
//App::instance().engine()->set_program(node_model()->path(), bank, program);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -20,6 +20,7 @@
|
|||
#include <string>
|
||||
#include <gtkmm.h>
|
||||
#include "util/Path.h"
|
||||
#include "NodeModel.h"
|
||||
|
||||
using std::string;
|
||||
using namespace Ingen::Client;
|
||||
|
|
|
@ -13,7 +13,6 @@ ingenuity_DEPENDENCIES = ../../libs/client/libingenclient.la
|
|||
# FIXME: make engine have a separate include dir
|
||||
if MONOLITHIC_INGENUITY
|
||||
ingenuity_CXXFLAGS += -I$(top_srcdir)/src/libs
|
||||
#ingenuity_LDADD += @JACK_LIBS@ @ALSA_LIBS@ @LASH_LIBS@ @SLV2_LIBS@ -lrt ../../libs/engine/libingen.la
|
||||
ingenuity_LDADD += ../../libs/engine/libingen.la
|
||||
ingenuity_DEPENDENCIES += ../../libs/engine/libingen.la
|
||||
endif
|
||||
|
@ -58,14 +57,14 @@ ingenuity_SOURCES = \
|
|||
PatchWindow.cpp \
|
||||
WindowFactory.h \
|
||||
WindowFactory.cpp \
|
||||
../../common/types.h \
|
||||
../../common/Path.h \
|
||||
NodeModule.h \
|
||||
NodeModule.cpp \
|
||||
PatchPortModule.h \
|
||||
PatchPortModule.cpp \
|
||||
DSSIModule.h \
|
||||
DSSIModule.cpp \
|
||||
DSSIController.h \
|
||||
DSSIController.cpp \
|
||||
SubpatchModule.h \
|
||||
SubpatchModule.cpp \
|
||||
Port.h \
|
||||
|
|
|
@ -174,10 +174,8 @@ PatchCanvas::connection(CountedPtr<ConnectionModel> cm)
|
|||
boost::shared_ptr<LibFlowCanvas::Port> dst = get_port(dst_parent_name, cm->dst_port_path().name());
|
||||
|
||||
if (src && dst) {
|
||||
boost::shared_ptr<Connection> c(new Connection(shared_from_this(), cm, src, dst));
|
||||
src->add_connection(c);
|
||||
dst->add_connection(c);
|
||||
add_connection(c);
|
||||
add_connection(boost::shared_ptr<Connection>(
|
||||
new Connection(shared_from_this(), cm, src, dst)));
|
||||
} else {
|
||||
cerr << "[Canvas] ERROR: Unable to find ports to create connection." << endl;
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
SUBDIRS = scripts
|
||||
|
||||
EXTRA_DIST = omecho.py omsynth.py OSC.py
|
||||
EXTRA_DIST = ingen.py ingenecho.py OSC.py
|
||||
|
||||
|
|
|
@ -1,2 +1,2 @@
|
|||
EXTRA_DIST = Om.sc example.sc
|
||||
EXTRA_DIST = Ingen.sc example.sc
|
||||
|
||||
|
|
|
@ -16,6 +16,7 @@ patchage_SOURCES = \
|
|||
StateManager.cpp \
|
||||
PatchageModule.h \
|
||||
PatchagePort.h \
|
||||
Driver.h \
|
||||
JackDriver.h \
|
||||
JackDriver.cpp \
|
||||
AlsaDriver.h \
|
||||
|
|
Loading…
Reference in New Issue