From 14d60966dc73fc4e550cba0a0c1ae125276e9822 Mon Sep 17 00:00:00 2001
From: hogliux <fabian.renn@gmail.com>
Date: Mon, 13 Mar 2017 17:15:57 +0000
Subject: [PATCH] Added support for VST3 SDK 3.6.7

You will need to update your VST3 SDK!
---
 .../Projucer/Source/Project Saving/jucer_ProjectExporter.cpp | 5 ++++-
 extras/Projucer/Source/Utility/jucer_StoredSettings.cpp      | 2 +-
 .../juce_audio_processors/format_types/juce_VST3Headers.h    | 4 +---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/extras/Projucer/Source/Project Saving/jucer_ProjectExporter.cpp b/extras/Projucer/Source/Project Saving/jucer_ProjectExporter.cpp
index f0382e847d..b6a44ba7ea 100644
--- a/extras/Projucer/Source/Project Saving/jucer_ProjectExporter.cpp	
+++ b/extras/Projucer/Source/Project Saving/jucer_ProjectExporter.cpp	
@@ -329,7 +329,10 @@ void ProjectExporter::addVST3FolderToPath()
     const String vst3Folder (getVST3PathValue().toString());
 
     if (vst3Folder.isNotEmpty())
-        addToExtraSearchPaths (RelativePath (vst3Folder, RelativePath::projectFolder), 0);
+    {
+        addToExtraSearchPaths (RelativePath (vst3Folder, RelativePath::projectFolder).getChildFile ("VST2_SDK"), 0);
+        addToExtraSearchPaths (RelativePath (vst3Folder, RelativePath::projectFolder).getChildFile ("VST3_SDK"), 0);
+    }
 }
 
 void ProjectExporter::addAAXFoldersToPath()
diff --git a/extras/Projucer/Source/Utility/jucer_StoredSettings.cpp b/extras/Projucer/Source/Utility/jucer_StoredSettings.cpp
index f4359176b5..0900231afc 100644
--- a/extras/Projucer/Source/Utility/jucer_StoredSettings.cpp
+++ b/extras/Projucer/Source/Utility/jucer_StoredSettings.cpp
@@ -277,7 +277,7 @@ bool StoredSettings::isGlobalPathValid (const File& relativeTo, const Identifier
 
     if (key == Ids::vst3Path)
     {
-        fileToCheckFor = "base/source/baseiids.cpp";
+        fileToCheckFor = "VST3_SDK/base/source/baseiids.cpp";
     }
     else if (key == Ids::rtasPath)
     {
diff --git a/modules/juce_audio_processors/format_types/juce_VST3Headers.h b/modules/juce_audio_processors/format_types/juce_VST3Headers.h
index 52ab3e5537..e38623af43 100644
--- a/modules/juce_audio_processors/format_types/juce_VST3Headers.h
+++ b/modules/juce_audio_processors/format_types/juce_VST3Headers.h
@@ -85,14 +85,12 @@
  #include <public.sdk/source/vst/vsteditcontroller.h>
 #else
  #include <base/source/baseiids.cpp>
- #include <base/source/fatomic.cpp>
  #include <base/source/fbuffer.cpp>
  #include <base/source/fdebug.cpp>
  #include <base/source/fobject.cpp>
- #include <base/source/frect.cpp>
  #include <base/source/fstreamer.cpp>
  #include <base/source/fstring.cpp>
- #include <base/source/fthread.cpp>
+ #include <base/source/flock.cpp>
  #include <base/source/updatehandler.cpp>
  #include <pluginterfaces/base/conststringtable.cpp>
  #include <pluginterfaces/base/funknown.cpp>