From 06a7b50d5ee29f4ef8381f19a453a6709a053af5 Mon Sep 17 00:00:00 2001
From: falkTX <falktx@gmail.com>
Date: Thu, 6 Feb 2014 12:21:29 +0000
Subject: [PATCH] Misc

---
 source/backend/Makefile.mk           | 2 +-
 source/bridges/Makefile              | 2 +-
 source/discovery/carla-discovery.cpp | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/source/backend/Makefile.mk b/source/backend/Makefile.mk
index 6886d469e..7f652a0ae 100644
--- a/source/backend/Makefile.mk
+++ b/source/backend/Makefile.mk
@@ -16,7 +16,7 @@ BUILD_CXX_FLAGS += $(LIBLO_FLAGS)
 BUILD_CXX_FLAGS += -DWANT_NATIVE
 
 ifeq ($(CARLA_PLUGIN_SUPPORT),true)
-BUILD_CXX_FLAGS += -DWANT_LADSPA -DWANT_DSSI -DWANT_LV2 -DWANT_VST -DWANT_AU -DWANT_REWIRE
+BUILD_CXX_FLAGS += -DWANT_LADSPA -DWANT_DSSI -DWANT_LV2 -DWANT_VST -DWANT_VST3 -DWANT_AU -DWANT_REWIRE
 ifeq ($(CARLA_VESTIGE_HEADER),true)
 BUILD_CXX_FLAGS += -DVESTIGE_HEADER
 endif
diff --git a/source/bridges/Makefile b/source/bridges/Makefile
index a07d7cff9..7a1f215a7 100644
--- a/source/bridges/Makefile
+++ b/source/bridges/Makefile
@@ -25,7 +25,7 @@ LINK_PLUGIN_FLAGS   = $(LINK_FLAGS)
 LINK_PLUGIN_FLAGS  += $(QTCORE_LIBS) $(QTXML_LIBS)
 
 ifeq ($(CARLA_PLUGIN_SUPPORT),true)
-BUILD_PLUGIN_FLAGS += -DWANT_LADSPA -DWANT_DSSI -DWANT_LV2 -DWANT_VST -DWANT_AU -DWANT_REWIRE
+BUILD_PLUGIN_FLAGS += -DWANT_LADSPA -DWANT_DSSI -DWANT_LV2 -DWANT_VST -DWANT_VST3 -DWANT_AU -DWANT_REWIRE
 ifeq ($(CARLA_VESTIGE_HEADER),true)
 BUILD_PLUGIN_FLAGS += -DVESTIGE_HEADER
 endif
diff --git a/source/discovery/carla-discovery.cpp b/source/discovery/carla-discovery.cpp
index f183818ec..3f8b5eb2d 100644
--- a/source/discovery/carla-discovery.cpp
+++ b/source/discovery/carla-discovery.cpp
@@ -1470,14 +1470,14 @@ static void do_juce_check(const char* const filename, const char* const stype, c
         DISCOVERY_OUT("error", "LADSPA support not available");
 #endif
     }
-    else if (std::strcmp(stype, "VST") == 0)
+    /*else if (std::strcmp(stype, "VST") == 0)
     {
 #if defined(WANT_VST) && JUCE_PLUGINHOST_VST
         pluginFormat = new VSTPluginFormat();
 #else
         DISCOVERY_OUT("error", "VST support not available");
 #endif
-    }
+    }*/
     else if (std::strcmp(stype, "VST3") == 0)
     {
 #if defined(WANT_VST3) && JUCE_PLUGINHOST_VST3
@@ -1971,7 +1971,7 @@ bool arrayContainsPlugin(const OwnedArray<PluginDescription>& list, const Plugin
 #ifdef WANT_LADSPA
 # include "juce_audio_processors/format_types/juce_LADSPAPluginFormat.cpp"
 #endif
-#ifdef WANT_VST
+#if 0 //def WANT_VST
 # include "juce_audio_processors/format_types/juce_VSTPluginFormat.cpp"
 #endif
 #ifdef WANT_VST3