From 54573ae2e5146ec87c6934d11148c29477c64dce Mon Sep 17 00:00:00 2001 From: jules Date: Fri, 4 May 2012 11:00:05 +0100 Subject: [PATCH] Reintroduced some packing settings for RTAS builds. --- .../RTAS/juce_RTAS_WinUtilities.cpp | 2 ++ .../juce_audio_plugin_client/RTAS/juce_RTAS_Wrapper.cpp | 3 +++ modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp | 8 ++++++++ 3 files changed, 13 insertions(+) diff --git a/modules/juce_audio_plugin_client/RTAS/juce_RTAS_WinUtilities.cpp b/modules/juce_audio_plugin_client/RTAS/juce_RTAS_WinUtilities.cpp index 5b0a86d3c8..d0ce94d785 100644 --- a/modules/juce_audio_plugin_client/RTAS/juce_RTAS_WinUtilities.cpp +++ b/modules/juce_audio_plugin_client/RTAS/juce_RTAS_WinUtilities.cpp @@ -43,7 +43,9 @@ #include #include +#pragma pack (push, 8) #include "../utility/juce_IncludeModuleHeaders.h" +#pragma pack (pop) //============================================================================== void JUCE_CALLTYPE attachSubWindow (void* hostWindow, diff --git a/modules/juce_audio_plugin_client/RTAS/juce_RTAS_Wrapper.cpp b/modules/juce_audio_plugin_client/RTAS/juce_RTAS_Wrapper.cpp index 8ead501720..159ac097a6 100644 --- a/modules/juce_audio_plugin_client/RTAS/juce_RTAS_Wrapper.cpp +++ b/modules/juce_audio_plugin_client/RTAS/juce_RTAS_Wrapper.cpp @@ -90,12 +90,15 @@ //============================================================================== #ifdef _MSC_VER + #pragma pack (push, 8) #pragma warning (disable: 4263 4264) #endif #include "../utility/juce_IncludeModuleHeaders.h" #ifdef _MSC_VER + #pragma pack (pop) + #if JUCE_DEBUGxxx // (the debug lib in the 8.0 SDK fails to link, so we'll stick to the release one...) #define PT_LIB_PATH JucePlugin_WinBag_path "\\Debug\\lib\\" #else diff --git a/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp b/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp index 70742568b2..98b1ca54a3 100644 --- a/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp +++ b/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp @@ -77,10 +77,18 @@ #endif //============================================================================== +#ifdef _MSC_VER + #pragma pack (push, 8) +#endif + #include "../utility/juce_IncludeModuleHeaders.h" #include "../utility/juce_FakeMouseMoveGenerator.h" #include "../utility/juce_PluginHostType.h" +#ifdef _MSC_VER + #pragma pack (pop) +#endif + #undef MemoryBlock class JuceVSTWrapper;