From b159e2f2bc543a95ded9951003f78a8e3a594503 Mon Sep 17 00:00:00 2001 From: falkTX Date: Sat, 22 Sep 2012 02:46:02 +0100 Subject: [PATCH] Fix build; Compile carla-internal plugins --- c++/carla-backend/Makefile | 5 +++++ c++/carla-backend/Makefile.dbg | 5 +++++ c++/carla-backend/carla_native.cpp | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/c++/carla-backend/Makefile b/c++/carla-backend/Makefile index 2f897ac..11c6bac 100644 --- a/c++/carla-backend/Makefile +++ b/c++/carla-backend/Makefile @@ -66,6 +66,7 @@ OBJS = \ carla_engine.o \ carla_engine_jack.o \ carla_engine_rtaudio.o \ + carla_native.o \ carla_osc.o \ carla_shared.o \ carla_threads.o \ @@ -74,6 +75,10 @@ OBJS = \ ../carla-lilv/carla_lilv.a \ ../carla-rtmempool/carla_rtmempool.a +OBJS += \ + plugins/bypass.o \ + plugins/midi-split.o + ifeq ($(WANT_RTAUDIO),true) CARLA_CXX_FLAGS += -Irtaudio-4.0.11 -Irtmidi-2.0.0 -DCARLA_ENGINE_RTAUDIO -DHAVE_GETTIMEOFDAY -D_FORTIFY_SOURCE=2 OBJS += rtaudio-4.0.11/RtAudio.o diff --git a/c++/carla-backend/Makefile.dbg b/c++/carla-backend/Makefile.dbg index 0ac38e1..a51b1e4 100644 --- a/c++/carla-backend/Makefile.dbg +++ b/c++/carla-backend/Makefile.dbg @@ -66,6 +66,7 @@ OBJS = \ carla_engine.o \ carla_engine_jack.o \ carla_engine_rtaudio.o \ + carla_native.o \ carla_osc.o \ carla_shared.o \ carla_threads.o \ @@ -74,6 +75,10 @@ OBJS = \ ../carla-lilv/carla_lilv.a \ ../carla-rtmempool/carla_rtmempool.a +OBJS += \ + plugins/bypass.o \ + plugins/midi-split.o + ifeq ($(WANT_RTAUDIO),true) CARLA_CXX_FLAGS += -Irtaudio-4.0.11 -Irtmidi-2.0.0 -DCARLA_ENGINE_RTAUDIO -DHAVE_GETTIMEOFDAY -D__RTAUDIO_DEBUG__ -D__RTMIDI_DEBUG__ OBJS += rtaudio-4.0.11/RtAudio.o diff --git a/c++/carla-backend/carla_native.cpp b/c++/carla-backend/carla_native.cpp index ffed502..724ed81 100644 --- a/c++/carla-backend/carla_native.cpp +++ b/c++/carla-backend/carla_native.cpp @@ -612,7 +612,7 @@ public: min = ranges.min; // max value - min = ranges.max; + max = ranges.max; if (min > max) max = min;