Merge branch 'master' into clients/inter_client_comms

nix
Owen Green 6 years ago
commit d44a16859d

@ -66,6 +66,7 @@ if(NOT flucoma-core_POPULATED)
add_subdirectory(${flucoma-core_SOURCE_DIR} ${flucoma-core_BINARY_DIR}) add_subdirectory(${flucoma-core_SOURCE_DIR} ${flucoma-core_BINARY_DIR})
include(flucoma_version) include(flucoma_version)
include(flucoma-buildtools) include(flucoma-buildtools)
include(flucoma-buildtype)
endif() endif()
set_if_toplevel(VAR CMAKE_LIBRARY_OUTPUT_DIRECTORY set_if_toplevel(VAR CMAKE_LIBRARY_OUTPUT_DIRECTORY

@ -42,7 +42,7 @@ FluidNRTProcess : Object{
c.test = true; c.test = true;
c.signal; c.signal;
} }
},'/done',argTemplate:[synth.nodeID]).oneShot; },'/done', srcID:server.addr, argTemplate:[synth.nodeID]).oneShot;
forkIfNeeded{ forkIfNeeded{
c.wait; c.wait;

Loading…
Cancel
Save