From d830f6c5d441595cb7b083d4438b385c36b2a776 Mon Sep 17 00:00:00 2001
From: jules <jules@rawmaterialsoftware.com>
Date: Wed, 26 Sep 2012 15:46:39 +0100
Subject: [PATCH] Couple of fixes for win32 AAX builds.

---
 extras/Introjucer/Source/Project/jucer_AudioPluginModule.h | 3 ++-
 modules/juce_audio_plugin_client/AAX/juce_AAX_Wrapper.cpp  | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/extras/Introjucer/Source/Project/jucer_AudioPluginModule.h b/extras/Introjucer/Source/Project/jucer_AudioPluginModule.h
index afd435de04..ad5b52f6f9 100644
--- a/extras/Introjucer/Source/Project/jucer_AudioPluginModule.h
+++ b/extras/Introjucer/Source/Project/jucer_AudioPluginModule.h
@@ -522,7 +522,8 @@ namespace AAXHelpers
 
             if (exporter.isVisualStudio())
             {
-                exporter.msvcTargetSuffix = ".aax";
+                exporter.msvcTargetSuffix = ".aaxplugin";
+                exporter.msvcNeedsDLLRuntimeLib = true;
             }
             else
             {
diff --git a/modules/juce_audio_plugin_client/AAX/juce_AAX_Wrapper.cpp b/modules/juce_audio_plugin_client/AAX/juce_AAX_Wrapper.cpp
index 273edb5df3..8e29335d27 100644
--- a/modules/juce_audio_plugin_client/AAX/juce_AAX_Wrapper.cpp
+++ b/modules/juce_audio_plugin_client/AAX/juce_AAX_Wrapper.cpp
@@ -31,7 +31,9 @@
 
 #if JucePlugin_Build_AAX && (JUCE_INCLUDED_AAX_IN_MM || defined (_WIN32) || defined (_WIN64))
 
-#if defined (__APPLE_CPP__) || defined(__APPLE_CC__)
+#ifdef _MSC_VER
+ #include <windows.h>
+#else
  #include <Cocoa/Cocoa.h>
 #endif
 
@@ -548,7 +550,7 @@ struct AAXClasses
 };
 
 //==============================================================================
-AAX_Result JUCE_CDECL GetEffectDescriptions (AAX_ICollection* const collection)
+AAX_Result JUCE_CDECL GetEffectDescriptions (AAX_ICollection* collection)
 {
     AAXClasses::JUCELibraryRefCount libraryRefCount;