@@ -25,14 +25,9 @@ | |||||
#include "modules/juce_audio_plugin_client/RTAS/juce_RTAS_Wrapper.cpp" | #include "modules/juce_audio_plugin_client/RTAS/juce_RTAS_Wrapper.cpp" | ||||
#elif JucePlugin_Build_VST | #elif JucePlugin_Build_VST | ||||
// we need to include 'juce_VSTMidiEventList' before 'juce_VST_Wrapper' | // we need to include 'juce_VSTMidiEventList' before 'juce_VST_Wrapper' | ||||
#include "modules/juce_audio_plugin_client/utility/juce_IncludeSystemHeaders.h" | |||||
#if JUCE_MAJOR_VERSION >= 6 | |||||
namespace Vst2 { | namespace Vst2 { | ||||
#endif | |||||
#include "modules/juce_audio_processors/format_types/juce_VSTInterface.h" | #include "modules/juce_audio_processors/format_types/juce_VSTInterface.h" | ||||
#if JUCE_MAJOR_VERSION >= 6 | |||||
} | } | ||||
#endif | |||||
#include "modules/juce_audio_processors/format_types/juce_VSTMidiEventList.h" | #include "modules/juce_audio_processors/format_types/juce_VSTMidiEventList.h" | ||||
#include "modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp" | #include "modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp" | ||||
#elif JucePlugin_Build_VST3 | #elif JucePlugin_Build_VST3 | ||||
@@ -81,6 +81,8 @@ | |||||
#include "../../juce_audio_processors/format_types/juce_VSTCommon.h" | #include "../../juce_audio_processors/format_types/juce_VSTCommon.h" | ||||
using namespace juce; | |||||
#ifdef _MSC_VER | #ifdef _MSC_VER | ||||
#pragma pack (pop) | #pragma pack (pop) | ||||
#endif | #endif | ||||
@@ -27,7 +27,10 @@ | |||||
#ifndef JUCE_VSTINTERFACE_H_INCLUDED | #ifndef JUCE_VSTINTERFACE_H_INCLUDED | ||||
#define JUCE_VSTINTERFACE_H_INCLUDED | #define JUCE_VSTINTERFACE_H_INCLUDED | ||||
using namespace juce; | |||||
using juce::int16; | |||||
using juce::int32; | |||||
using juce::uint32; | |||||
using juce::pointer_sized_int; | |||||
#if JUCE_MSVC | #if JUCE_MSVC | ||||
#define VSTINTERFACECALL __cdecl | #define VSTINTERFACECALL __cdecl | ||||
@@ -24,8 +24,9 @@ | |||||
============================================================================== | ============================================================================== | ||||
*/ | */ | ||||
// NB: this must come first, *before* the header-guard. | |||||
#ifdef JUCE_VSTINTERFACE_H_INCLUDED | |||||
#pragma once | |||||
#include "juce_VSTInterface.h" | |||||
namespace juce | namespace juce | ||||
{ | { | ||||
@@ -187,5 +188,3 @@ private: | |||||
}; | }; | ||||
} // namespace juce | } // namespace juce | ||||
#endif // JUCE_VSTINTERFACE_H_INCLUDED |