From 8bb39013d9b5d75f8dce33db1582c19c0021b912 Mon Sep 17 00:00:00 2001 From: falkTX Date: Mon, 7 Apr 2014 01:25:43 +0100 Subject: [PATCH] Some more --- source/backend/engine/CarlaEngineBridge.cpp | 2 +- source/backend/plugin/NativePlugin.cpp | 1 + source/bridges/Makefile | 12 +++++------- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/source/backend/engine/CarlaEngineBridge.cpp b/source/backend/engine/CarlaEngineBridge.cpp index 49927421d..c85ff9f87 100644 --- a/source/backend/engine/CarlaEngineBridge.cpp +++ b/source/backend/engine/CarlaEngineBridge.cpp @@ -103,7 +103,7 @@ struct BridgeControl : public RingBufferControl { char shm[32]; BridgeControl() - : RingBufferControl(nullptr), + : RingBufferControl(nullptr), data(nullptr) { carla_zeroChar(shm, 32); diff --git a/source/backend/plugin/NativePlugin.cpp b/source/backend/plugin/NativePlugin.cpp index cda84571d..5678a63d6 100644 --- a/source/backend/plugin/NativePlugin.cpp +++ b/source/backend/plugin/NativePlugin.cpp @@ -2184,6 +2184,7 @@ protected: (void)index; (void)value; (void)ptr; + (void)opt; } // ------------------------------------------------------------------- diff --git a/source/bridges/Makefile b/source/bridges/Makefile index a8232ea7d..f3b1b6a74 100644 --- a/source/bridges/Makefile +++ b/source/bridges/Makefile @@ -36,7 +36,12 @@ endif ifeq ($(HAVE_JUCE),true) LINK_PLUGIN_FLAGS += $(JUCE_AUDIO_BASICS_LIBS) +LINK_PLUGIN_FLAGS += $(JUCE_AUDIO_PROCESSORS_LIBS) LINK_PLUGIN_FLAGS += $(JUCE_CORE_LIBS) +LINK_PLUGIN_FLAGS += $(JUCE_DATA_STRUCTURES_LIBS) +LINK_PLUGIN_FLAGS += $(JUCE_EVENTS_LIBS) +LINK_PLUGIN_FLAGS += $(JUCE_GRAPHICS_LIBS) +LINK_PLUGIN_FLAGS += $(JUCE_GUI_BASICS_LIBS) endif # -------------------------------------------------------------- @@ -74,13 +79,6 @@ ifeq ($(HAVE_DGL),true) NATIVE_LINK_FLAGS += $(DGL_LIBS) endif -ifeq ($(HAVE_JUCE),true) -LINK_PLUGIN_FLAGS += $(JUCE_DATA_STRUCTURES_LIBS) -LINK_PLUGIN_FLAGS += $(JUCE_EVENTS_LIBS) -LINK_PLUGIN_FLAGS += $(JUCE_GRAPHICS_LIBS) -LINK_PLUGIN_FLAGS += $(JUCE_GUI_BASICS_LIBS) -endif - # ifeq ($(HAVE_CSOUND),true) # NATIVE_BUILD_FLAGS += -DWANT_CSOUND # NATIVE_BUILD_FLAGS += $(CSOUND_FLAGS)