From 7875fffa2a7a4b6bde3fc779e50c04403e9d5d3f Mon Sep 17 00:00:00 2001
From: jules <jules@rawmaterialsoftware.com>
Date: Tue, 26 Mar 2013 10:16:14 +0000
Subject: [PATCH] Introjucer: fixed some AAX + RTAS paths.

---
 .../Source/Project/jucer_AudioPluginModule.h  | 26 +++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/extras/Introjucer/Source/Project/jucer_AudioPluginModule.h b/extras/Introjucer/Source/Project/jucer_AudioPluginModule.h
index f23e6606de..106b9e53a5 100644
--- a/extras/Introjucer/Source/Project/jucer_AudioPluginModule.h
+++ b/extras/Introjucer/Source/Project/jucer_AudioPluginModule.h
@@ -190,6 +190,13 @@ namespace
         return exporter.getVisualStudioVersion() < 10 ? CodeHelpers::addEscapeChars (text.quoted())
                                                       : CodeHelpers::addEscapeChars (text).quoted();
     }
+
+    String createRebasedPath (ProjectExporter& exporter, const RelativePath& path)
+    {
+        return createEscapedStringForVersion (exporter,
+                                              exporter.rebaseFromProjectFolderToBuildTarget (path)
+                                                      .toWindowsStyle());
+    }
 }
 
 //==============================================================================
@@ -264,11 +271,6 @@ namespace RTASHelpers
 
     static bool isExporterSupported (ProjectExporter& exporter)   { return exporter.isVisualStudio() || exporter.isXcode(); }
 
-    static RelativePath getRTASFolderRelativePath (ProjectExporter& exporter)
-    {
-        return exporter.rebaseFromProjectFolderToBuildTarget (getRTASFolderPath (exporter));
-    }
-
     static void fixMissingRTASValues (ProjectExporter& exporter)
     {
         if (getRTASFolder (exporter).toString().isEmpty())
@@ -306,6 +308,7 @@ namespace RTASHelpers
                                 "AlturaPorts/TDMPlugins/PluginLibrary/Interfaces",
                                 "AlturaPorts/TDMPlugins/common",
                                 "AlturaPorts/TDMPlugins/common/Platform",
+                                "AlturaPorts/TDMPlugins/common/Macros",
                                 "AlturaPorts/TDMPlugins/SignalProcessing/Public",
                                 "AlturaPorts/TDMPlugIns/DSPManager/Interfaces",
                                 "AlturaPorts/SADriver/Interfaces",
@@ -368,12 +371,15 @@ namespace RTASHelpers
         {
             fixMissingRTASValues (exporter);
 
+            const RelativePath rtasFolder (getRTASFolderPath (exporter));
+
             if (exporter.isVisualStudio())
             {
                 exporter.msvcTargetSuffix = ".dpm";
 
-                String winbag (getRTASFolderRelativePath (exporter).getChildFile ("WinBag").toWindowsStyle());
-                exporter.msvcExtraPreprocessorDefs.set ("JucePlugin_WinBag_path", createEscapedStringForVersion (exporter, winbag));
+                exporter.msvcExtraPreprocessorDefs.set ("JucePlugin_WinBag_path",
+                                                        createRebasedPath (exporter,
+                                                                           rtasFolder.getChildFile ("WinBag")));
 
                 RelativePath juceFolder (exporter.getJucePathFromTargetFolder());
                 if (juceFolder.getFileName() != "modules")
@@ -404,7 +410,6 @@ namespace RTASHelpers
             {
                 exporter.xcodeCanUseDwarf = false;
 
-                RelativePath rtasFolder (getRTASFolderPath (exporter));
                 exporter.xcodeExtraLibrariesDebug.add   (rtasFolder.getChildFile ("MacBag/Libs/Debug/libPluginLibrary.a"));
                 exporter.xcodeExtraLibrariesRelease.add (rtasFolder.getChildFile ("MacBag/Libs/Release/libPluginLibrary.a"));
             }
@@ -580,9 +585,8 @@ namespace AAXHelpers
                     if (config->getValue (Ids::useRuntimeLibDLL).getValue().isVoid())
                         config->getValue (Ids::useRuntimeLibDLL) = true;
 
-                exporter.msvcExtraPreprocessorDefs
-                    .set ("JucePlugin_AAXLibs_path",
-                          createEscapedStringForVersion (exporter, aaxLibsFolder.toWindowsStyle()));
+                exporter.msvcExtraPreprocessorDefs.set ("JucePlugin_AAXLibs_path",
+                                                        createRebasedPath (exporter, aaxLibsFolder));
             }
             else
             {